tree 1ed3da193f3c785511d8fce2ed74fe502032830f
parent 5988355af4635094a99e408ce4199e9d19af6f9e
parent a8b94925abb022d6ae4f897852a16d7dc680e636
author Gilles Debunne <debunne@google.com> 1297226339 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1297226339 -0800

Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp