| commit | 7017cfe124721cadd3315a0a5700c83545916673 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 19 14:20:21 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 19 14:20:21 2013 -0700 |
| tree | 9816b25a4d8b4c0505c49eb1e8873e69758dfb30 | |
| parent | 3497ef575318aafbe06387a474ae6d5152fae82f [diff] | |
| parent | 1a35c2298b120222a0e88487130cac6ae9b6ef50 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Id68bc43f09ff7d7aa7f48ed9cdca06e14aea4c9c