diff options
| author | Nick Kralevich <nnk@google.com> | 2015-08-08 17:23:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 17:23:06 +0000 |
| commit | f2a8aa34eb137780e9fb0e7335355ec50db2cae6 (patch) | |
| tree | 597ae5de646e9732c0950c4d41cfd726e4c61c75 | |
| parent | 33c7b97781764b9a56b06aca3c5022fbd2da16b0 (diff) | |
| parent | fdcade18504881c84e264d0c5831df0ae00aa2ec (diff) | |
| download | android_development-f2a8aa34eb137780e9fb0e7335355ec50db2cae6.tar.gz android_development-f2a8aa34eb137780e9fb0e7335355ec50db2cae6.tar.bz2 android_development-f2a8aa34eb137780e9fb0e7335355ec50db2cae6.zip | |
am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)
* commit 'fdcade18504881c84e264d0c5831df0ae00aa2ec':
0 files changed, 0 insertions, 0 deletions