tree b0308e429d953ffd23ee4218e7bbad46b1899bad
parent 27ad1fbc2c62bf44558e98ec89a392b39277e818
parent 0b0834fbe8d71e46a7372a0c6737d440cd1dc533
author Phil Weaver <pweaver@google.com> 1500414272 +0000
committer android-build-merger <android-build-merger@google.com> 1500414272 +0000

Merge "Back-port fixes for b/62196835" into nyc-dev
am: 0b0834fbe8

Change-Id: Ie3ade206625af7f69d497935397cd3094a1555fb