Merge changes I6e84da66,Ie9e3ed09

am: 556566e5ad

Change-Id: I537c6950e41528f9d609a2d208abcb755aeed6df
This commit is contained in:
Colin Cross 2016-10-13 23:30:17 +00:00 committed by android-build-merger
commit a5b861c23f

Diff Content Not Available