tree d6ae9f810b4a126cf6dcf8fc18188ecddd6abedd
parent 9bdc290792f8c5c4e4beb40e6b7f335759b6d6d5
parent 343597c3aa4e17bdba4c911d081a6d161fb1c758
author Jean-Baptiste Queru <jbq@google.com> 1335997354 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1335997472 -0700

resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp

Change-Id: I84648a8044e6238a57b4a08a261146bfa3c8c1c7