tree f2cc1c88198ca6fc0a5526eab81b87074d109c46
parent 08dabcc22207b56afe7cf40d17f56041652434b7
parent 9bc59c20d0bc0683c537560ea92c581eeaf1ebe9
author Geoff Mendal <mendal@google.com> 1392935844 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392935844 +0000

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

* commit '9bc59c20d0bc0683c537560ea92c581eeaf1ebe9':