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