| commit | 397ae6e5d018bff472cac12eb184c6cf700e7e63 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 25 17:02:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 25 17:02:14 2013 -0700 |
| tree | ee10c8bd8d5f662827800d33398c931497d762b7 | |
| parent | 8202f732bf727c4784ddd81e31cbf18a4221ca88 [diff] | |
| parent | 349ef841374a0dc016883e7bb7260b988b6a0c7c [diff] |
am 349ef841: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '349ef841374a0dc016883e7bb7260b988b6a0c7c':