tree 42961626c81e6aa431aa45c5569e02b6ca6d93d6
parent 7cb7292f046bb860069a0881fc45753872551079
parent 2e2849a5e4927fce51be7f0bd44fbf07e4bcd14d
author Jean-Baptiste Queru <jbq@google.com> 1345674957 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1345674987 -0700

ignore merge of 2e2849a5 to jb-dev-plus-aosp

Change-Id: Ie13c209a6646a08107ffecc9e63610fd5b9fab55