commit | 1a903cbdde8e2a0103a1c8ba2598d22f98ef9f5a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 08 13:40:36 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 08 13:40:36 2013 -0700 |
tree | b434273c2c13c59465c67b6575c58cd6fba43b8f | |
parent | 2acc769200b56ca144dbff6f778c7369078b9a6f [diff] | |
parent | 1cd0e20269fb5faf6cd85e338b7370648a95f8ef [diff] |
am 1cd0e202: Reconcile with jb-mr2-release - do not merge * commit '1cd0e20269fb5faf6cd85e338b7370648a95f8ef':