tree 9252080737aa25cc45d801a34875224ca8a9620c
parent ab380fd77d4872d94cda212e91cdf9a847d99bf9
parent 21c4f4e6e6fa532ee670e5d063533da321113f46
author Elliott Hughes <enh@google.com> 1465576397 +0000
committer android-build-merger <android-build-merger@google.com> 1465576397 +0000

Merge \\\"Remove etc/META-INF/com/google/android/update-script.\\\" am: 5b2191a9d6 am: 5be6ae12b5
am: 21c4f4e6e6

Change-Id: I62527d8d5217384c1524090da3428fea31d03615