| commit | fae78087083b07f92f32f687b1073c7fe1e67ef5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:38:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 10:38:55 2013 -0700 |
| tree | e2d2ead97744880c5d0eb019d160d9694327056c | |
| parent | 9a90a82c92f7d8a248ec40b2d6c2addaa3b356c8 [diff] | |
| parent | f2d5533e87b18069b77abea531dfdee627306887 [diff] |
am f2d5533e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit 'f2d5533e87b18069b77abea531dfdee627306887': "JSR67" JWR66 "JSR66" JWR65