| commit | 62ea063df0c96ff549e1fe6d4bbdbf4836f23d3d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 07 10:22:12 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 07 10:22:12 2012 -0800 |
| tree | 86b0ee643f5e01047be4a966bc1ca07a87aa76a4 | |
| parent | 42a111e579f2de6c834573285409a47d842c4057 [diff] | |
| parent | 7cb8e4ae66a4a9f73ed40576efd5da4d86e9a2a0 [diff] |
am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge * commit '7cb8e4ae66a4a9f73ed40576efd5da4d86e9a2a0':