| commit | 28d08da009e5d3f3072eaa7bb249a4861cb00540 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sun Jun 16 07:49:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jun 16 07:49:23 2013 -0700 |
| tree | a8a9d2edbc9cdf95c643cf3a568d18856285e851 | |
| parent | 662a6d580647182cab82cf27e13bd6e8117615f6 [diff] | |
| parent | 67413d251e4490674213b259a2e40eb91da7a76d [diff] |
am 67413d25: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '67413d251e4490674213b259a2e40eb91da7a76d':