tree 0b58f551214399aeabda9e029818d4c4e9d1049d
parent aae96409ac47cb3edfcd934b2ce1dbf071808ab5
parent e389632fe7a3f0ae547d595ff5ca4fa337a0138a
author Jean-Baptiste Queru <jbq@google.com> 1291674783 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1291674783 -0800

Merge "Merge from gingerbread-plus-aosp"