Merge changes Ia0ca36fc,Ib42c0635

am: 1abc3cd641

Change-Id: I67bfecac71d4fef20835dab3d226ec3d54847fa0
This commit is contained in:
Dan Willemsen 2016-11-30 06:06:07 +00:00 committed by android-build-merger
commit 695e6182d3

Diff content is not available