| commit | 7d99328bb96474b99c902d97780ba96d95ec8d6f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 26 12:37:50 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 26 12:37:50 2013 -0700 |
| tree | 756e1fe0ef128afc1fa9ab29c9de0eb48d824ffa | |
| parent | 88dc28a563f05e5cd1a28a8a177762bfc328cb30 [diff] | |
| parent | 5ff9a453b4335f685418287f27bfb6f37ccd6ff1 [diff] |
am 5ff9a453: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '5ff9a453b4335f685418287f27bfb6f37ccd6ff1':