| commit | 6de9dd93242275672f5175b134a39d6e1c2cc2dd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 17 07:33:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 17 07:33:32 2013 -0700 |
| tree | f9847fb316f232a2d97403909ab659243843a515 | |
| parent | 87a9ce019a9bbeb94628e82d51bb9423f836e066 [diff] | |
| parent | f0db59627543ef0ae918039870de5583f5e475c9 [diff] |
am f0db5962: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'f0db59627543ef0ae918039870de5583f5e475c9': "JSR78"