tree 10da860fcff71886af91d082e31f0e1917926848
parent 38e7a056009c77f18e08f1da31c944d5c374c361
parent 38ede6d74bf3b70e86a6eb99307dae79df45976e
author Geoff Mendal <mendal@google.com> 1414566471 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566471 +0000

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

* commit '38ede6d74bf3b70e86a6eb99307dae79df45976e':