| commit | 618a183c58f9baf8a5ce5f2de5d116c8377b1428 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:42:57 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:42:57 2012 -0700 |
| tree | 30e334c0369afd25830723d45723e724143b5c9a | |
| parent | 681666588660fc5f83c1d9c146e61190a0fa3fca [diff] | |
| parent | 133155e3d825266900c9bf9464163f27faf69838 [diff] |
am 133155e3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '133155e3d825266900c9bf9464163f27faf69838':