tree bb7f0e1b93a01142b6ec59f9572f5ccb8d11d3b7
parent 0e61a7268460392b706904c032cb6ae7f931692f
parent f8f76d52a7f7cf9ceb57670b5cf62052ddc8662d
author Jean-Baptiste Queru <jbq@google.com> 1340460539 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1340460539 -0700

resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp

Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f