| commit | 426bf5adf0f6f3f5579ae2b97c2caaee7dae1fe7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 26 12:33:18 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 26 12:33:18 2013 -0700 |
| tree | 144b24d27f46e4068a1e3ecab1d204becbc298cb | |
| parent | 90aa9d848485a9209e80b1beadecf8dd3ba3553c [diff] | |
| parent | 69fb023e6139525239144d0b5a58fbecad1006ef [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: If7ea39ba97f444cd714be425a9545ba89f4ef7f2