am a358badf: Merge d4b7315d55 to mnc-dev-plus-aosp to fix build.

* commit 'a358badf0266d5188b86aecdcf4f33e0d4491ae1':
This commit is contained in:
Mike Dodd
2015-08-26 03:47:36 +00:00
committed by Android Git Automerger

Diff Content Not Available