| commit | 6f5b83fd04a392260cd600941ae2731138583441 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:29:09 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:29:09 2012 -0800 |
| tree | 235d3dbfedef2f430810e385904b288f4d8af991 | |
| parent | 28275a7611ecdb079e8a8a2d63d2ee03f4f468e4 [diff] | |
| parent | f81fa0e5f3eb0f122b2c70da05edb5387853e21f [diff] |
am f81fa0e5: (-s ours) am 1508faa5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'f81fa0e5f3eb0f122b2c70da05edb5387853e21f':