Merge changes I21eefab9,I0ac7d78a

am: 4c38a921c2

Change-Id: I2de89c9d7c6fdcd1b7904701dcc575e9709011f1
This commit is contained in:
Josh Gao 2017-01-25 21:55:30 +00:00 committed by android-build-merger
commit 21e681aaf3

Diff content is not available