| commit | aea388d689024c640f53f84d0568a1347a943a62 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 22 22:46:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 22:46:13 2014 +0000 |
| tree | db9199af29a0d15ac74f0fc8615abfb35e7dc4c3 | |
| parent | 048e9ab752b67d9223860b491c44a6d91946401e [diff] | |
| parent | dedce805ec541aa8c33c56544c62a24530e9b929 [diff] |
am dedce805: (-s ours) am 52d02199: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'dedce805ec541aa8c33c56544c62a24530e9b929':