am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread

* commit '0c61e105906f96e5139beb8162c0ead8787faf7a':