| commit | 445505f1d0e03f41d227c45b88414ad063c4b814 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:34:24 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 15 09:34:24 2013 -0700 |
| tree | 8ed5cf4faec2d1883dc451b8adc6f08098413439 | |
| parent | 56eecebc7f58c2dcf2300b87b08247171277e679 [diff] | |
| parent | ccf2f3dd142d0ad973d913990a358d7fc6af2a8d [diff] |
am ccf2f3dd: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'ccf2f3dd142d0ad973d913990a358d7fc6af2a8d': "JSS15"