tree d936cbbed0e716729a6af940829e312e8cf9fa1d
parent 315d38e9773af8d060045fe8611eab85597cbd3f
parent c5d9527ef9afcc59e700d3a4f0aa18831c2a9da0
author Jean-Baptiste Queru <jbq@google.com> 1363034662 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034662 -0700

am c5d9527e: am cc9002b1: am 666a30d5: am 63cc80ff: (-s ours) am 1419f206: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c5d9527ef9afcc59e700d3a4f0aa18831c2a9da0':