tree 1a3c683f8da28300d3c93bea95b96290d9e30dbe
parent ae1f9dce706eb45cfaa1d1f16fae3cf83517a2f3
parent 3bffa0529c5c0f72876452b6a29eae965cda8b1d
author Jean-Baptiste Queru <jbq@google.com> 1290041279 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1290041279 -0800

resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp

Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8