tree 6641e346ffdbbc892dcb3e952b83eff3e7fdeeef
parent a81076b2e8a157f6ec10f75e1152ae518dcf7365
parent 72c56fb84a4438299ab4fc528f4bc84730642862
author Phil Weaver <pweaver@google.com> 1500426658 +0000
committer android-build-merger <android-build-merger@google.com> 1500426658 +0000

Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028
am: 72c56fb84a  -s ours

Change-Id: Ib0b35737306bce22a49bddeea0d7abdc8ecb1bc3