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

* commit '7ecb0a3e5c50837d1b9ea6d952805a9b3795448e':
This commit is contained in:
Eric Gilmore
2014-11-03 21:01:54 +00:00
committed by Android Git Automerger

Diff Content Not Available