Merge commit '45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp * commit '45cda90bdc178e253049c7067c78bf4b1204ba82': Be brief.
Merge commit '45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp * commit '45cda90bdc178e253049c7067c78bf4b1204ba82': Be brief.