| commit | 3902e1967eacb8211c2805eb4281c555bb0df8d8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:29:15 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 13:29:15 2012 -0800 |
| tree | ffeb7223cd0fcb786a826cce4da5367a7e4c4461 | |
| parent | 413b280dcbd3108a44728aac111035d47409ee77 [diff] | |
| parent | f2701a8a6e1b5a056e4c8609713ff9b045fc1e82 [diff] |
am f2701a8a: Reconcile with jb-mr1-release - do not merge * commit 'f2701a8a6e1b5a056e4c8609713ff9b045fc1e82':