tree f409e9713f1a67839b170f76e42c273667b91449
parent ec838b885dd8b74b8682dd2498c7da8f7afca291
parent c09444eb5b66a5702db99d9b7de23cb73bf11aa4
author Jean-Baptiste Queru <jbq@google.com> 1363030916 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030916 -0700

am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c09444eb5b66a5702db99d9b7de23cb73bf11aa4':