tree 368ffdee5359be7466ce242f5441bacd55aaf2ee
parent e02247f4c53e1df4cac3a7b265ffb4307cca3650
parent 61c04aad1e2313a22822173f3776b85d664984ae
author Jean-Baptiste Queru <jbq@google.com> 1363029782 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363029782 -0700

am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '61c04aad1e2313a22822173f3776b85d664984ae':