| commit | b7739c14d7c29fbb9cd11391c79b8010dccf4fc2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 24 11:50:02 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 24 11:50:02 2013 -0700 |
| tree | 13cdf502a012863a00f436ae1f75471182644a62 | |
| parent | 0402a4b12c63b7bf0250d85f4f6edd715cfb8848 [diff] | |
| parent | 2ca8825aff762b5657f4f0b661bf20c7e2957c60 [diff] |
am 2ca8825a: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '2ca8825aff762b5657f4f0b661bf20c7e2957c60': JSR82B