| commit | cc1140c05f06e41f3e16a739957c96ad6c0bed50 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 03 11:36:42 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 03 11:36:42 2012 -0800 |
| tree | bf7174f88d78a17b284ce73c20c471e329f539d7 | |
| parent | 8f5c1cdafd7085a2561802a30036e81f3e7a35c0 [diff] | |
| parent | db9a64c8f23ec133c8553e52e7c37aa2fe40bb31 [diff] |
am db9a64c8: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'db9a64c8f23ec133c8553e52e7c37aa2fe40bb31':