tree 17e9492f12d039caa9d8ec43823b6e1dc1b6b9b4
parent 41840b6e0c34a61234f9473201c7aa1eb0aa0d3d
parent fc29db992a61ce4bd2f82a9ed2b615db66a9e1d7
author Elliott Hughes <enh@google.com> 1465576561 +0000
committer android-build-merger <android-build-merger@google.com> 1465576561 +0000

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

Change-Id: I9e530f8a40c600fe00c2bff26dbe99c5d07bb195