am a358badf: Merge d4b7315d55 to mnc-dev-plus-aosp to fix build.
* commit 'a358badf0266d5188b86aecdcf4f33e0d4491ae1':
This commit is contained in:
a358badf: Merge d4b7315d55 to mnc-dev-plus-aosp to fix build.
* commit 'a358badf0266d5188b86aecdcf4f33e0d4491ae1':