tree 10a3ce3f8977e7159435723b27ea392a6d0bfcbf
parent 194d2026a3fc685a0ed9afc8080060155a983c95
parent 7ecb0a3e5c50837d1b9ea6d952805a9b3795448e
author Eric Gilmore <egilmore@google.com> 1415048514 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415048514 +0000

am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36

* commit '7ecb0a3e5c50837d1b9ea6d952805a9b3795448e':