| commit | 1f2bed9b871685b6bd7bca6cebb9e2fb0f4d2243 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 10:07:43 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 10:07:43 2012 -0700 |
| tree | 0f6eece1a49f3ce0ba4c0c01b64d59587f937d9f | |
| parent | f3af614261f11308cfa65c70d484b71217893402 [diff] | |
| parent | 35abf7abd1eb3a9f5de7a6ae8114f95e6183019d [diff] |
am 35abf7ab: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '35abf7abd1eb3a9f5de7a6ae8114f95e6183019d':