tree c9e58a52cf480b9d80a2d639107187e34c536337
parent 51ca95dc08a411b7973b5d0626e43f8ba0753370
parent 3ea075bee78d8c82b0209c43d02e2324846fbe3e
author Kenny Root <kroot@google.com> 1310754014 -0700
committer Kenny Root <kroot@google.com> 1310754014 -0700

resolved conflicts for merge of 3ea075be to honeycomb-plus-aosp

Change-Id: Ic668cb99822d4bc44f2f57782afd1a6c1b348e9b