| commit | 8870070d426f910cc223b3ea4f2f33a1c477014a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:23:10 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:23:10 2013 -0700 |
| tree | 18edaa92da53733b027bb753a10cdaa472e98e07 | |
| parent | 31b161cedce884cb7a1426f810d4e1cba9d33f46 [diff] | |
| parent | d6da9bb65e752e59835c8ce5412f9848bafc77d9 [diff] | |
| parent | fba3d4e98fac09a394c20cb66fb7d0232e8c5ead [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I9f012993eb7dccac74fec611f0ea1c8dcd71d93f