| commit | be5ffb8e10022fcdb6e83e1d2cb0efaced481184 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 12 14:55:01 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 12 14:55:01 2013 -0700 |
| tree | eed97e5db17aad47456bf29e6e1a33a4aa0d35a2 | |
| parent | 7600917dac6259d6b30960fb7a14b618150701a4 [diff] | |
| parent | 29b708aac70b694879d4867e1943926716a08fea [diff] |
am 29b708aa: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '29b708aac70b694879d4867e1943926716a08fea': JSS11F "JSS11E"