tree 54311354e395c216cdf5f5d606efe9f4d59bfff9
parent 0b0834fbe8d71e46a7372a0c6737d440cd1dc533
parent 996bc6bc12b928664a7e9e74896b8a40c2eced07
author Phil Weaver <pweaver@google.com> 1500422308 +0000
committer android-build-merger <android-build-merger@google.com> 1500422308 +0000

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4
am: 996bc6bc12  -s ours

Change-Id: Iccbeb4cec6e40c00e7f875b5e3faa94772f1b819