tree 603fe2c89d1e5d00ba0155b5efad83451eb0ef9e
parent 2730dc9b3d34ef636d76d3e1d293706062e01639
parent 708ac518e03a76536d31481b33222881a8ac9b03
author Jean-Baptiste Queru <jbq@google.com> 1342800876 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1342800913 -0700

Reconcile with AOSP

Change-Id: I147da3a9ba69aad6402b4c40615ab7b871e78c95