| commit | 33ef4ee71277888304a3c67fdd8dfddd728b4c88 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Jun 18 10:26:36 2012 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Jun 18 10:26:36 2012 -0700 |
| tree | 801ef4c7dd0c1aad76254717e10d4d2d0c4c99da | |
| parent | 98e955d295441636ba19688e18a8223691256d2c [diff] | |
| parent | 4de60b26091b269c22803297c88b66ca5e3aed5f [diff] |
resolved conflicts for merge of 4de60b26 to jb-dev-plus-aosp Change-Id: Id1b1847a3ab5c0f51ac8a732fce5ba12e5810259