tree 6e464a2c0ca1d011ce9385898101276e0744826e
parent 4e7d837c51b575cdfc267e399159ebf185cefe2b
parent 3e15867df7fb41770c090ee40411a6c376574ae3
author Jean-Baptiste Queru <jbq@google.com> 1306962843 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1306962845 -0700

Merge from gingerbread

Change-Id: I4a71e1392d781243dbd0814fedc7cd598c8e156d