| commit | 6f1bd30a04ffe855170318fd60e378dd035963e5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:01:23 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 19:01:23 2012 -0700 |
| tree | 100ae3fb97b8bffcd33b263b5fbca0fbe942183d | |
| parent | 3eea132abfa31bdd24686ef0aeff5e9d89ae5f6c [diff] | |
| parent | 2e11b0f07861c41af10b23c477cc6e89fac709ba [diff] |
am 2e11b0f0: (-s ours) am 36bec56c: am dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge * commit '2e11b0f07861c41af10b23c477cc6e89fac709ba': JRO03R JZO47 JRO03Q