tree 801ef4c7dd0c1aad76254717e10d4d2d0c4c99da
parent 98e955d295441636ba19688e18a8223691256d2c
parent 4de60b26091b269c22803297c88b66ca5e3aed5f
author Kenny Root <kroot@google.com> 1340040396 -0700
committer Kenny Root <kroot@google.com> 1340040396 -0700

resolved conflicts for merge of 4de60b26 to jb-dev-plus-aosp

Change-Id: Id1b1847a3ab5c0f51ac8a732fce5ba12e5810259