commit | a34207b4f22849956a8b417f566c7493be62a36d | [log] [tgz] |
---|---|---|
author | Gloria Wang <gwang@google.com> | Thu Oct 07 15:27:17 2010 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Thu Oct 07 15:27:17 2010 -0700 |
tree | 19aabb3f1a49b5b96b18c4b1ffd531bfbf2ceffa | |
parent | c501b3049030f2cd39f1602b071351821f7b8fde [diff] | |
parent | 74d354972dc298b66a5878f28a96b45b007996ea [diff] |
resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76