Merge changes I1d03564f,I883e4e6c

am: 5b21deb786

Change-Id: I0a92e6f94174c76731159957172a6596cb9147ce
This commit is contained in:
Josh Gao 2016-11-29 18:18:50 +00:00 committed by android-build-merger
commit c58f49bf1b

Diff content is not available