tree 61c0967e91759d2e6774ef2d72ee2f2c7380bcc1
parent 6e20b04ed07925521b92c70eda6d8bdcb62ff3d9
parent d7267fc295f43167488a52f249cbd58b5ac8507e
author Raphael <raphael@google.com> 1290509099 -0800
committer Raphael <raphael@google.com> 1290509099 -0800

resolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp

Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9