| commit | 963484eeea92d1964760c81aa4e6ac42f787e0c3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 03 07:36:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 07:36:31 2012 -0700 |
| tree | ee89c270b45291ac130c211d77b068722e35b91d | |
| parent | c2e3e0754943cdf24f7075357e5a333599517eb8 [diff] | |
| parent | 670916447290d619e4b689d3643f629f058fc244 [diff] |
am 67091644: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '670916447290d619e4b689d3643f629f058fc244':