tree 670b946b2e421308b8addfcaf1290163c57e847a
parent 1689c3459b27657b6900429ae64ac5323c584ce3
parent 07457acf75acc67e9cbf35913dfb84a702e49ec4
author Romain Guy <romainguy@google.com> 1295298444 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295298444 -0800

Merge "Don't break the build... update to 11.xml." into honeycomb