| commit | 07cc2ac3ec9e1a0992e6fcd3b609b3b8f7ae33c9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 30 14:24:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 30 14:24:13 2013 -0700 |
| tree | b996b95afcc7876c8420c47c29ae16e74d3dbc2d | |
| parent | 7c118cf589a87b9f3f34d61ee9cceef0463b4f9f [diff] | |
| parent | 90b0da19ff58ac5a4dc31f649f34b19396c5c774 [diff] |
am 90b0da19: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '90b0da19ff58ac5a4dc31f649f34b19396c5c774':