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

* commit 'e2fbd0a9b03956dbb7d787ed435b895cfc735780':