commit | 205e2b9bd2f9a132bde70fdc47c884ad575440f9 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 25 17:28:29 2010 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 25 17:28:29 2010 -0700 |
tree | 4ca64e6705104fcfb33576e9aa815f1a29a55c17 | |
parent | 376fd3f8dee47126e8a34886c961143860a30696 [diff] | |
parent | 5c8eb900abde42702e7dd4154a8730e5cc44d46b [diff] |
Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp