tree 0f4bb95d9aba4a754c4b64e357f4045a538664da
parent 55781f8cd8e29672fb1fd939d27e72c59d6527aa
parent f272375120f3a416edf72bb3f8ffd43b8c237d68
author Dan Albert <danalbert@google.com> 1518202480 +0000
committer android-build-merger <android-build-merger@google.com> 1518202480 +0000

Adapt to upstream changes. am: 2eddfdfc54 am: 18fda00ac0
am: f272375120

Change-Id: I42565cf0cddb4dba9e9e5db32c4071fcbfa46361