tree ac360ff544e13250919cdd7d743cde0bfa3725c7
parent 16837adae33cef18ab2bc12db7bb52e69be3c00e
parent 41ef4a98af08474bd63067629fcca4fdf53e8f0e
author Howard Chen <howardsoc@google.com> 1488543364 +0000
committer android-build-merger <android-build-merger@google.com> 1488543364 +0000

Port for Android Build/Mac environment am: a8830dcf25 am: 087bd70f9a
am: 41ef4a98af

Change-Id: I4491e1dbb5cf67114ce266da939286e6bd6409f8