tree f7d2a206b03920b6c819925f52a99afd80a2b9ab
parent e365ed0cb095eed5fbc6a86c21642113e2c24f21
parent 294cefd490efdfc42bfc2a87a80b4d1a364713ee
author Jean-Baptiste Queru <jbq@google.com> 1363030061 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030061 -0700

am 294cefd4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '294cefd490efdfc42bfc2a87a80b4d1a364713ee':