tree 512aa5507bf60631597c06e77ff58a2e2d99b76b
parent 67bb6741965c0b9f3bf6b4caf2647efc564e287e
parent 9084631dba8938942ddd8d4cb1e0f9149965ae8e
author Gloria Wang <gwang@google.com> 1288045384 -0700
committer Gloria Wang <gwang@google.com> 1288048278 -0700

resolved conflicts for merge of 9084631d to gingerbread-plus-aosp

Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472