tree 12c193f8f784f503dc80aad6602a47a3b7a0e170
parent 2a697feb3931a053a5c72913a461db7210119087
parent 5be6ae12b510c3ebe2d616a4d4f8f53422a9120f
author Elliott Hughes <enh@google.com> 1465576234 +0000
committer android-build-merger <android-build-merger@google.com> 1465576234 +0000

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

Change-Id: Ia2aace34275d4ef517b0bf47a8c9ae04f47a3f05