| commit | 1c0e7a9cb2ca53c662e853421d7fa08ca5ad8538 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 10:17:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 10:17:25 2013 -0700 |
| tree | effa22031f55a3260979ca2776a36e59c55fc634 | |
| parent | cf5dd91ec796abad8f6464687439c47f5a86f3df [diff] | |
| parent | 1bb59258458350af518170558120783bc2f9e61d [diff] |
am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '1bb59258458350af518170558120783bc2f9e61d':