tree e05504d30d8b27c0f221dd2cfc2361e27c49c287
parent de53f6ed295c96b5e23113c44fb6323254f4d147
parent 77a62c8b6df9d70ecd442d296d515e9cfa42d339
author Jean-Baptiste Queru <jbq@google.com> 1363030065 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030065 -0700

am 77a62c8b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '77a62c8b6df9d70ecd442d296d515e9cfa42d339':