| commit | bb398a6394dfddc69559cbc62da24571af976fff | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 13 08:25:37 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 13 08:25:37 2013 -0700 |
| tree | 79f19f80ebb7978e9bab16e1d9b835849c735592 | |
| parent | 51ee28d24c0d3000124bd435657dbaf68c65a049 [diff] | |
| parent | a45398078e4f798a34310a2d5213e07eefb14238 [diff] |
am a4539807: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'a45398078e4f798a34310a2d5213e07eefb14238':