tree 3a7f463f78490e3191c9db6390ac0031f703c098
parent 4c37b79cc9c3af57be4ca7f9ff40bceaad948d95
parent cf72f25981606b4e48130890f22f713d41e0d420
author Deepanshu Gupta <deepanshu@google.com> 1397685244 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397685244 +0000

am cf72f259: Fix incorrect merge conflict to klp-modular-dev-plus-aosp

* commit 'cf72f25981606b4e48130890f22f713d41e0d420':
  Fix incorrect merge conflict to klp-modular-dev-plus-aosp