tree 866fec8c533aba5f6d0e03117ddfb094ed1938e6
parent 3a461898644a5620ec10de4b8b31ae330e09b171
parent 916ed50dec6bba0eaf6dfc4fb2641dc2929b7412
author Dan Albert <danalbert@google.com> 1518202474 +0000
committer android-build-merger <android-build-merger@google.com> 1518202474 +0000

Adapt to upstream changes. am: 80bd2e4b23 am: 48a3fead9e
am: 916ed50dec

Change-Id: Ifa1907af0ae872ff5c2147a2b039e15b62d23178