tree 83d1eb96c1b64e1b68daa8fb84d7ff61e633acb1
parent 8bdc24e308ed275adc522ebf8d9df6bc3a6d7bde
parent 91d4d71a04b378a1cda5edd8a0c245f7a612a7eb
author Jean-Baptiste Queru <jbq@google.com> 1280164978 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1280164978 -0700

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

Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76