| commit | 805eda42524816e19f8d85703c669fb8ada3af2a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 27 15:17:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 27 15:17:16 2012 -0700 |
| tree | 1445e27659322488b855bef2aea88041be0656b7 | |
| parent | b4e634fd05cde3d2a38634b795f21586a789d7be [diff] | |
| parent | 43e17d5fbf8786ccbeaf64a6dae8643d1daae2b9 [diff] |
am 43e17d5f: am e4b6c5dd: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '43e17d5fbf8786ccbeaf64a6dae8643d1daae2b9':