tree 7693de1e50d0df0447a68560020442b697564199
parent cfcb3562066fd49bbfc14b33632a5d316b126266
parent 2f89987494ca6aa9799e6e6282fb8838e4c539ec
author Steven Moreland <smoreland@google.com> 1490767058 +0000
committer android-build-merger <android-build-merger@google.com> 1490767058 +0000

Merge "Fix update-makefile-helpers."
am: 2f89987494

Change-Id: I20a389d80a051084a4882e6987a689688272be79