tree 5862b78d667371e87353d024d877a07edf11fa94
parent 930540de4415795500e22f02bb707768b7742fc6
parent 2f3c1638351db28f560acb819772a397d47d4192
author Jean-Baptiste Queru <jbq@google.com> 1363030914 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030914 -0700

am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2f3c1638351db28f560acb819772a397d47d4192':