tree 8a59e0b024c419cfcf3d55e0d41a1c9e6c1d56fc
parent dacd5de146b413de86d38b6f56a3fe0b2af4b155
parent 17d6b4c1f7ce789475478375416959ff35fd09cb
author Jean-Baptiste Queru <jbq@google.com> 1363030092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030092 -0700

am 17d6b4c1: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '17d6b4c1f7ce789475478375416959ff35fd09cb':