| commit | 4c7db154564031237df705641f27d504d4ae3f11 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 16 11:19:23 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 16 11:19:23 2013 -0700 |
| tree | 4796c19442b00c7f258ce334827250820c38328f | |
| parent | 8e7e42547116b1d5f49118ba41946b2906ad3936 [diff] | |
| parent | cb93edf08463af30ceca25c1343545513a2d3650 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I44d1b4bc2d06e2ec3d7837693a1880d7e6cf1774