tree 099de02f30b1ddb6f6ef7158b3c7abc060aaaa6f
parent 3166db09941fce8c340f80900cc7d8f3d92fd583
parent 1e04f5b26cec7705b893a13b6b83b7725e9b5f35
author Gloria Wang <gwang@google.com> 1288731779 -0700
committer Gloria Wang <gwang@google.com> 1288731779 -0700

resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp

Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455