| commit | 25c8c528101360119f2aafc1871811cc1a5ad519 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:37:16 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:37:16 2013 -0700 |
| tree | 70e1fb2290d3f75eea762ff25bb497819a2f97d2 | |
| parent | 4dd110ae6d9f00e1ec036f697045f4b3326b7873 [diff] | |
| parent | 5c192e5d4fcec8aa2dd14be539ac28ffff4a12fa [diff] | |
| parent | 1f8600a320ccd9f8b6e9b2f8f8fb0f011832caa3 [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I0aa9bb7e725a8352da3eae512c2a62df4f12e3b3