commit | d72ec85d1d0b92ed82927e3925f21912a659b799 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 15 10:49:01 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 15 10:49:01 2013 -0700 |
tree | ddee593d432336ad174f2f36bc4f92e200e3f35d | |
parent | 0011777d54148dc84a923dda21b25f4f5a99ffed [diff] | |
parent | da69f1c26bff1729331456db7e9c933bf82663d0 [diff] |
am da69f1c2: Reconcile with jb-mr2-release - do not merge * commit 'da69f1c26bff1729331456db7e9c933bf82663d0':