tree 47de161311c70aad428c3891bd67af2c654d6e10
parent e189fb463b42cb3fd59ffe901c1f2a0bceee827b
parent 7464c1fa93f348f3f4fc8906e7cb8ecc65e5f0f8
author Jean-Baptiste Queru <jbq@google.com> 1348265666 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1348265666 -0700

resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp

Change-Id: If76931ca5a3046cdfebf9b4e9fcbe638691ca65b