tree 7003618ce11b9487eb10cb38d0f9069e9156c12f
parent 0ec3759065cda150e51ad5a25e46b2d547ea3c5f
parent 685395d2811a7a98f15bfe85451d069c7160df7b
author Jean-Baptiste Queru <jbq@google.com> 1342805803 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1342805957 -0700

Reconcile with AOSP

Change-Id: Idad87247d9cad32a65ec1a3e49bffdb8a13cab74