tree e3e42be2fee33ffb0f26fbb523f1b5db524a5839
parent 1ff207481efb407c7b25feeba37ca5cbd06436e0
parent 4bec7db2891981132532f39b0bfb06e25b8eb51d
author Jeff Hao <jeffhao@google.com> 1497572466 +0000
committer android-build-merger <android-build-merger@google.com> 1497572466 +0000

Merge "Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev am: 08b3fd966c am: ba06f3fd18" into oc-dr1-dev-plus-aosp
am: 4bec7db289

Change-Id: I86abf20e0e9555e5e1aa8831c2f6432b4bcf877d