tree 461b2e93dd64c1096330734defcc008d22848b46
parent fe8e356b7da70853e8fd76e38ce90b9dbf238a4f
parent 5b2191a9d64288398fea1a0149ee14b00004ac4b
author Elliott Hughes <enh@google.com> 1465576069 +0000
committer android-build-merger <android-build-merger@google.com> 1465576069 +0000

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

Change-Id: Ie27f4c9d78de710eb45a87fed9c0aaf6b71404b6