| commit | 971a3797f630f958ca7698a88d26faa3fc4eee15 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 11:58:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 21 11:58:19 2013 -0700 |
| tree | 52bf860d401f71e3a40dc82da5b21e8016797748 | |
| parent | 10e41c3275673f6826ffa8b9777bd8e0dfba5bb3 [diff] | |
| parent | 70b89b2bb95022a182437996697cce7c15e6d8a7 [diff] |
am 70b89b2b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '70b89b2bb95022a182437996697cce7c15e6d8a7': "JSR82"