tree 2b7e71ff8cba33f426522a064465993e5e8c763b
parent 3a09ce54ab8b8bd98c59c9047e2d00adc9b2de09
parent 3573d54d505bee9f9ffefc8ae555aeb0076eba75
author Jorim Jaggi <jjaggi@google.com> 1500906860 +0000
committer android-build-merger <android-build-merger@google.com> 1500906860 +0000

Merge "Merge "Revert "Removed overlay from target"" into oc-dr1-dev am: 8a7f2128b3 am: 2145739ff4" into oc-mr1-dev-plus-aosp
am: 3573d54d50

Change-Id: I0f0e0c70dea8efa9506e426d21fecec9a6a56513