| commit | 676897e697c87f50650093dbbcd79f037d191a83 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:33:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 08 15:33:42 2013 -0700 |
| tree | 59026414564cd725effe5b500738e47e0a5fddf3 | |
| parent | a553ea1eb16ddfe636f61cf8c7b3dfff8323612e [diff] | |
| parent | 7e1b93cbd5b647db496cc587c90a012af0529dff [diff] |
am 7e1b93cb: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '7e1b93cbd5b647db496cc587c90a012af0529dff': "JSS08"