| commit | 43a73e04a456a9d053e8f3ff192e2fe68ca01361 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 18 09:46:43 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 18 09:46:43 2012 -0800 |
| tree | 5cea790f8365daea8b4d6ad21d04895ed95cb1a6 | |
| parent | 5f1a503f4a4419ba8d3987f2ea0fa4cedb984003 [diff] | |
| parent | ea208f9540852d6286ece8b51b4e6bca1d0db417 [diff] |
am ea208f95: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'ea208f9540852d6286ece8b51b4e6bca1d0db417':