| commit | 3bf4fa4b161342ac94e97844c7af0982f4a2758d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 29 08:10:35 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 29 08:10:35 2013 -0700 |
| tree | 4fbcfebbd4b98c60afc9b78201b97452c8263c88 | |
| parent | 5bee398f16762aab765e2e189efac4716324f94d [diff] | |
| parent | 452b488c51d99c20ce485207719aabe62419591f [diff] |
am 452b488c: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '452b488c51d99c20ce485207719aabe62419591f':