| commit | 5a051a7f0af2e206afd8c1e765eb80690345a536 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:26:57 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:26:57 2012 -0800 |
| tree | 2462e169462e77e4ef545e0a1d86e75a14db3fa5 | |
| parent | 701d8a0e1af9d667b5c03a30ffb275359f048415 [diff] | |
| parent | ce561a8a597b4dd3c9f11a2a76af963b2e9f5ab1 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ibf539c16a9086609d5baf494ea5156c8967d02a5