| commit | 040c13b3a5d02edf3b2d1a8a0791145f7130ae9f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 16 05:48:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 05:48:23 2013 -0700 |
| tree | 68a871428d73b28421de0a41ef6440b211c40499 | |
| parent | f86243115aae7afa7b6c0464adf6cc8bd39dc5d2 [diff] | |
| parent | 9ad2c67ab0da915134dc6020f57cce8f7cb30c70 [diff] |
am 9ad2c67a: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '9ad2c67ab0da915134dc6020f57cce8f7cb30c70':