| commit | 9eee2116557dadfbfd9f4a890ae1b507b7a23e43 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Mar 29 09:54:35 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 29 09:54:35 2013 -0700 |
| tree | 75ac7f71e118100ff5e622bf30e4ee434a8e7adf | |
| parent | 0eb53b64aa4ab9c14194e5bcde8b18c28afc0860 [diff] | |
| parent | 1c93bb9548d897d7bdfad01446ddb10835e83bf0 [diff] |
am 1c93bb95: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '1c93bb9548d897d7bdfad01446ddb10835e83bf0':