tree d6accf056dcef0c1f3ad473f43c1269810823bed
parent 00143e1a7ae0ebfb4b36cb4c7782d0df0a96ca3e
parent 87c77fba9213d5a0fd90d9944f6a5abd7078dbc3
author Phil Weaver <pweaver@google.com> 1500425600 +0000
committer android-build-merger <android-build-merger@google.com> 1500425600 +0000

Merge "Back-port ag/2491664" into nyc-mr1-dev
am: 87c77fba92

Change-Id: Ie540995d5b499a0e87bc13c11e28c4b8adab93f3