| commit | d81cf9e7463ff7fc2d0c7c6ccaa9b17e216bc5c6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 10 09:48:02 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 09:48:02 2012 -0700 |
| tree | e803b727566f90f7f32f10547b5de452a7001ae7 | |
| parent | 1311d48b0d159df56d85dd24fd8ee6c68332480f [diff] | |
| parent | 1595c5a8b8b6dc2dddcc79c2fa8239914125b124 [diff] |
am 1595c5a8: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '1595c5a8b8b6dc2dddcc79c2fa8239914125b124':