tree 002f4fdcff3be08c7a480d7a604e9f9d4fca84f3
parent db0017e5e2c167f6dfe0f95ad02063970d95e37d
parent a1727092595a65e4dd9d9a6bae3778ad8c31d77f
author Jean-Baptiste Queru <jbq@google.com> 1283202798 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1283202798 -0700

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

Change-Id: Icce8b9cb0c6ebfe2c4278c19c50aafb85a9ba4d8