commit | 2788887b2363be0f12b43ab2c6fa8c31906876d3 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 15 08:32:39 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 08:32:39 2012 -0700 |
tree | 0c4c9281a73adfe829a50709b118b577b429c3b1 | |
parent | 19f0e138d0e7f4f1233db4086f04214fd288d919 [diff] | |
parent | d2c653514cd77fc8ce73c4da40ac9e2a9d4a74f5 [diff] |
am d2c65351: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd2c653514cd77fc8ce73c4da40ac9e2a9d4a74f5':