| commit | 66343615e5b8e91e231dd1433dac00e008e6db24 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:43:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:43:19 2012 -0700 |
| tree | 2df133e5b5cd33c8a0f5388516d9a273a1fce219 | |
| parent | 0cf28dc5cc202b9dcca6ec22ba57e1600406cb26 [diff] | |
| parent | d832219fbc7ba878700b1ec289e159563a20e7e1 [diff] |
am d832219f: (-s ours) Reconcile with jb-mr1-factory-release - do not merge * commit 'd832219fbc7ba878700b1ec289e159563a20e7e1':