diff options
| author | Konstantinos Menychtas <kmenychtas@google.com> | 2015-08-27 12:17:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 12:17:46 +0000 |
| commit | d80bd87351d328d92c3c2b42802fc7c837e73a61 (patch) | |
| tree | 55f14758d30a9c1e7fa3015c665822bb1363e950 | |
| parent | 949c63b07d4bf26aef0c8d3ae6bcfd92e666a3d0 (diff) | |
| parent | 238a03a3d1ddd280c97e072646212252f02933ed (diff) | |
| download | platform_sdk-d80bd87351d328d92c3c2b42802fc7c837e73a61.tar.gz platform_sdk-d80bd87351d328d92c3c2b42802fc7c837e73a61.tar.bz2 platform_sdk-d80bd87351d328d92c3c2b42802fc7c837e73a61.zip | |
am 238a03a3: (-s ours) am c78d07c6: am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp
* commit '238a03a3d1ddd280c97e072646212252f02933ed':
0 files changed, 0 insertions, 0 deletions