| commit | cb066089c549bfe092419e594f84172cc26b4433 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 11 15:37:02 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 11 15:37:02 2013 -0700 |
| tree | 93c880ec2e8df3367167435118925dcd7ee85d4e | |
| parent | 4297ce7d0e182876451ba4a6ed947ff5dae76b04 [diff] | |
| parent | 31b161cedce884cb7a1426f810d4e1cba9d33f46 [diff] |
am 31b161ce: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '31b161cedce884cb7a1426f810d4e1cba9d33f46': "JSR72"