Merge changes I6dc353a2,I7df990f0

am: bb612a356a

Change-Id: Ibbf0934024884e8c24d6592e9963f549ef90a032
This commit is contained in:
Colin Cross 2016-12-16 00:23:14 +00:00 committed by android-build-merger
commit 3a3e02e835

Diff Content Not Available