tree eaff7d37ba3032d6462fa461c4a03f7828481db1
parent 7f0f0f69d2e3e908e80f05e6237bb48666f24cd6
parent 7d5f1d21937f73102e47ea094112f913b0a62923
author Ed Heyl <edheyl@google.com> 1386368356 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386368356 +0000

am 7d5f1d21: am 049dc0cc: am 4ed83a2b: merge in KQS81M

* commit '7d5f1d21937f73102e47ea094112f913b0a62923':