Merge changes I0a00b3d4,I19cb0694

am: 67855d8454

Change-Id: I4d98ea47da41b1d8543a29a8e3539d73389067c6
This commit is contained in:
Josh Gao 2016-09-15 02:27:33 +00:00 committed by android-build-merger
commit ba4a61348d

Diff content is not available