tree cba62d0d64153aa2169651696bc238591341d679
parent 253e9df603d89af35765629b9e3fe14283295653
parent 9bc59c20d0bc0683c537560ea92c581eeaf1ebe9
author Geoff Mendal <mendal@google.com> 1414092781 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414092781 +0000

am 9bc59c20: (-s ours) Merge commit \'457e9215df2a8353f484a268950623d714afa01c\' into klp-dev-plus-aosp

* commit '9bc59c20d0bc0683c537560ea92c581eeaf1ebe9':