commit | 5ab5655343591baa8b315f8f0513112a1798d389 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 12 07:28:32 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 07:28:32 2012 -0800 |
tree | 8ad1b340a6cf206802d4d1c97919c0ef518782e6 | |
parent | 803b2acb8ff92cf295a42423d266d4122e9c496e [diff] | |
parent | f8fbfd9fcfc311c66c37d3e63e1feb01726e0b4f [diff] |
am f8fbfd9f: Reconcile with jb-mr1-release - do not merge * commit 'f8fbfd9fcfc311c66c37d3e63e1feb01726e0b4f':