tree 1fa49de77d453e0e3a6974ee52ed03cbac61975a
parent 0bc8843fada735280241c8ac00888f7668921eb6
parent 99417194b394702484d8250736e95f524fd51fe2
author Deepanshu Gupta <deepanshu@google.com> 1402097009 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402097009 +0000

am 99417194: Merge 910cfd from klp-modular-dev to klp-modular-dev-plus-aosp

* commit '99417194b394702484d8250736e95f524fd51fe2':