commit | 225590c05a304358d34cfffcdb408560fb4410cc | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:06:47 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 19:06:47 2012 -0700 |
tree | b7764606ec9511b54a1adba75c491a92f31f24b0 | |
parent | 118343187a520ec6a3afa568b4a1d882fb697767 [diff] | |
parent | f763b2fc07ee79045ca6c47e54d09dec90694e6c [diff] |
am f763b2fc: (-s ours) am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'f763b2fc07ee79045ca6c47e54d09dec90694e6c':