tree 023429b3d7e10d16ac3118b2fa928750a3179dbe
parent b579811b01322593470dd9c9f265860630073f34
parent 307d9cfc1690ec4982152aae1b6bd24ff8e078ed
author Jean-Baptiste Queru <jbq@google.com> 1335318618 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335318618 -0700

am 307d9cfc: Merge from AOSP

* commit '307d9cfc1690ec4982152aae1b6bd24ff8e078ed':