tree 286a4a4a32c34e16b09c2df531bd855557b7f084
parent 3463d0e1026263d9d740c3324138a346b0c9006d
parent 76aa8d0a8bc753b1fffa239609d4364699fec6cc
author Jean-Baptiste Queru <jbq@google.com> 1292372599 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1292372616 -0800

resolved conflicts for merge of 76aa8d0a to gingerbread-plus-aosp

Change-Id: I7fa43d5b5d52b68baca3e4848cd308fea1d1fb98