| commit | be9b0aadc758b0b75a4117696a31c975c3cea19c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 22 22:46:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 22:46:10 2014 +0000 |
| tree | db9199af29a0d15ac74f0fc8615abfb35e7dc4c3 | |
| parent | 872adcd0daddca1a35175ed354f5fdc5884f4b5e [diff] | |
| parent | 1586000f39e110e98cfdbbeb3743cc47b5738e0c [diff] |
am 1586000f: (-s ours) am ebfe4acc: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '1586000f39e110e98cfdbbeb3743cc47b5738e0c':