| commit | 94c6443411ff86f8bd7b111290806188d141ce2d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:29:16 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:29:16 2012 -0800 |
| tree | 193751862d9ecd48f8d9e462d759918d7dec2e83 | |
| parent | 815598bd61964d2ee231a57c9391a589220beb50 [diff] | |
| parent | e1e9db52f8df0681114665b56368f7b19449ee33 [diff] |
am e1e9db52: (-s ours) am 322b9737: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'e1e9db52f8df0681114665b56368f7b19449ee33':