commit | 7f737ca14895f4263c4ff4390a0e7ad0149a7a62 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Tue Sep 14 09:14:00 2010 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Tue Sep 14 09:14:00 2010 -0700 |
tree | b9f2044947138db54689abad819fdafcf380552c | |
parent | e5c06198330df7c57cc4e04db068629765ecb32c [diff] | |
parent | 8bf09b6200101c050af76118e1980ac2ccf2a0c5 [diff] |
resolve merge of 8bf09b62 to gingerbread-plus-aosp Change-Id: If94475b19837abf8f1ee427cf6f6da929cdcf105