tree f6963754bee3000f47369d0fa4328ab49d6d4e1e
parent e749c32a866b41702168812430ea74201c23e687
parent 8a6077ce8fb417e94ba1ace84243cca6bb3944c3
author Jean-Baptiste Queru <jbq@google.com> 1363032395 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032395 -0700

am 8a6077ce: am f994bd37: am 8bf124f0: (-s ours) am ae812451: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8a6077ce8fb417e94ba1ace84243cca6bb3944c3':