| commit | 4550fe1d40fa8784ef62d47a920c5b2c4ab38e5a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 12 07:30:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 12 07:30:00 2013 -0700 |
| tree | f3e79ef96884e074d4bf811e25c6f5591ba8d914 | |
| parent | 7ba0850a473eee9b4f66d313f7b875dca7ab0854 [diff] | |
| parent | 76be17de7a7fc811da0145252855802d06d55367 [diff] |
am 76be17de: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '76be17de7a7fc811da0145252855802d06d55367': "JSS11D" JSS11C "JSS11B"