| commit | f2d5533e87b18069b77abea531dfdee627306887 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:36:57 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:36:58 2013 -0700 |
| tree | 18edaa92da53733b027bb753a10cdaa472e98e07 | |
| parent | cfe8d12213daf8b6de51679ee9686c4042ed944e [diff] | |
| parent | afeb5b4779ca5b4749ad8702ac0ab50362d6be64 [diff] | |
| parent | bdcb7fcde2200d05243dc1c3984df50dd7189531 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I23c04c52ecd129d541eaaf3a3a597e5533a6bc59