| commit | ed1eeaec9f2ce0177d592c92eb486873d52a418a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:22:39 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:22:39 2012 -0700 |
| tree | 203c44ce07e9026e931aeb02d4283bf649a4e2cf | |
| parent | e6f454ac43764a6796748069d48fcbaae04051d4 [diff] | |
| parent | 3232aaa3ba7b1f6c2196fd9ac2493689c6885645 [diff] |
am 3232aaa3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '3232aaa3ba7b1f6c2196fd9ac2493689c6885645':