| commit | 896412bf3bcffe8e1331dd635542b4ac76c01b26 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 11:24:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 11:24:32 2012 -0800 |
| tree | 9ee5b5a8bc95a0f8f7a5e965810b087f5ff75343 | |
| parent | c42a143ddb9b7489c8788c891318410997e553d5 [diff] | |
| parent | 413b280dcbd3108a44728aac111035d47409ee77 [diff] |
am 413b280d: am 4844b206: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '413b280dcbd3108a44728aac111035d47409ee77':