tree 8368c2dafa4858f870ed7ed5e3e892f614ad87c5
parent 11833f38674947e1dddb12537782d78b42b0cd90
parent 5e667cc092b51bf91ee9f6562dc824a2c753d1e6
author Ed Heyl <edheyl@google.com> 1386282486 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386282486 +0000

am 5e667cc0: (-s ours) merge in KQS81M

* commit '5e667cc092b51bf91ee9f6562dc824a2c753d1e6':