| commit | a1eeb3e9524ba6e91c870dc6ee82ab47d82521ad | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:43:08 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:43:08 2012 -0700 |
| tree | 15b25065ea5f0d816cac3f0d30b9c76a8f82255f | |
| parent | 13cc47a6775cc471e1af80b8ec8a1fefb3cf3500 [diff] | |
| parent | 2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae [diff] |
am 2ee4be8d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae':