| commit | 2ff37b246ae1242d015ff40433a444bcee9ff586 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 26 12:37:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 26 12:37:49 2013 -0700 |
| tree | de708257e6d7cab67d0f9444ab9c1e8428919f95 | |
| parent | a4ba587282779ab3081966fb65f1e59a819fe85c [diff] | |
| parent | 426bf5adf0f6f3f5579ae2b97c2caaee7dae1fe7 [diff] |
am 426bf5ad: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '426bf5adf0f6f3f5579ae2b97c2caaee7dae1fe7': "JSR87"