| commit | 5843b313152fc353a4ea4b489a5e988f236e80f0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 11:58:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 21 11:58:25 2013 -0700 |
| tree | 9f9a0d0f5124ec83719d86e6736627e8474c6736 | |
| parent | ac20e81bc597ce3d7c301f6059ca82c13d1c32df [diff] | |
| parent | 3341f4598972336bf9f465c9b12be7aea3de90f6 [diff] |
am 3341f459: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '3341f4598972336bf9f465c9b12be7aea3de90f6':