commit | 5e7813d82c96492fce6b745a247b35e387432465 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 22 22:46:15 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 22:46:15 2014 +0000 |
tree | db9199af29a0d15ac74f0fc8615abfb35e7dc4c3 | |
parent | 497a6005b4f5719e15a7b84ac47c86bf44b088ea [diff] | |
parent | ad9dd15de1e2884f72de669baa18538dbe008264 [diff] |
am ad9dd15d: (-s ours) am 7877095f: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'ad9dd15de1e2884f72de669baa18538dbe008264':