| commit | e3f5df60ce35333a7df23f726905f4bb328abc8f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:32:33 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:32:34 2013 -0700 |
| tree | 5c151bde23ba1457bfeaff51b0b3cfec7e1b58fd | |
| parent | fdfeb83c37bde5e58562a64016bfad56f7e3620f [diff] | |
| parent | 7ebfe0de4f9e0fc7a4c7b39864bd13a8a80e141c [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I860f40ab238fb1f6a0a5c963065e4c09ab3a38e4