tree 2d1ea138ebba7a858b7e1ffdba84d18e083f0d45
parent 4ffbf43de3b34a7095ffdbdecf48cb9a9b6449ce
parent cc11f66cfdc7d7afacb382694436fe3ddc3c05cf
author Tao Bao <tbao@google.com> 1507825702 +0000
committer android-build-merger <android-build-merger@google.com> 1507825702 +0000

Merge "applypatch: Move to Soong." am: b058c5c481 am: 7722d8255c
am: cc11f66cfd

Change-Id: I5530a2adf2526cb689e91539579717568783243e