tree dc09a6f564735ecf827422531dbd3b6d9ff957ba
parent e2419c89cef4eeae1b6cd113ef1c92d397834841
parent 8cbdef7eba1ef83d009326aaba750e78f68b061f
author Jean-Baptiste Queru <jbq@google.com> 1306939327 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1306939339 -0700

Merge from open-source gingerbread

Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b