commit | 3d35d2661351ecce8beabdf17c8cbac4ed03c937 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 12 16:59:15 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 12 16:59:15 2012 -0700 |
tree | 250dc4716a50b04fe102371a42f9692ecb9e8182 | |
parent | 1a474d0e5c08ea8fedef967ca516db07431260bd [diff] | |
parent | c2203765ea773939cc1a3fe3a77d887c91d0719b [diff] |
am c2203765: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c2203765ea773939cc1a3fe3a77d887c91d0719b':