tree c0cdfb4a702705d8189282fd1f2ae1a6318037fa
parent ed27b812253bb904ebb995f29e79ff0efdd30cb1
parent 2f30ba2e5745ef1a4268c45c13709c0a27fab5b2
author Christopher Ferris <cferris@google.com> 1415063871 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415063871 +0000

am 2f30ba2e: am a18bcfa4: am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. automerge: e916313 automerge: a228c63

* commit '2f30ba2e5745ef1a4268c45c13709c0a27fab5b2':