Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp

automerge: 068cb36

* commit '068cb36877144dc337766c1113250f5ebc2cbf6f':
This commit is contained in:
Eric Gilmore
2014-11-03 20:53:40 +00:00
committed by android-build-merger

Diff Content Not Available