| commit | 977d5835a65bdd66fe7642c34f5b9d88f2331732 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 13 08:25:36 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 13 08:25:36 2013 -0700 |
| tree | ea6df94cb074bf3aec18f7812cc25b2f12ef9db4 | |
| parent | 0baade6562dabf1d42eb5e83949c7a06eae75172 [diff] | |
| parent | 1e6cb5a8f26420bf94c6bc194d95002d9366caa4 [diff] |
am 1e6cb5a8: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '1e6cb5a8f26420bf94c6bc194d95002d9366caa4': "JSR74" JWR66L JWR66K