| commit | 3a4fdca66f8985152e695f702f925af41e5f8aed | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 10:17:26 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 10:17:26 2013 -0700 |
| tree | e367431b65f9e6c05696e04c964728fd6879aefe | |
| parent | 92d15004822fc9dc36c167e1aa0f205038971fbf [diff] | |
| parent | 7c8042a39858bc42e3eb5ede616acbee7e8a3f06 [diff] |
am 7c8042a3: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '7c8042a39858bc42e3eb5ede616acbee7e8a3f06': "JSS10"