| commit | c6ab3495ad0af0f9683ab958c21d80aa978127c4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 01 07:44:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 01 07:44:19 2013 -0700 |
| tree | 8a537f84fd13afb1e8d9656ffa27a06c9da3e557 | |
| parent | d68fd63477644853ae672efcb3e3d913b54279a0 [diff] | |
| parent | ce285571ceb3b5165e81eb8522097d203696b918 [diff] |
am ce285571: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'ce285571ceb3b5165e81eb8522097d203696b918':