tree 6746fe1db5a29a72e77e1e92d392e3c02b76af4a
parent 10bf90f60fc8d9f7c5764081854835098082c684
parent 8a7f2128b31307abf61d0e5f00b8a1910c84a8d0
author Jorim Jaggi <jjaggi@google.com> 1500905619 +0000
committer android-build-merger <android-build-merger@google.com> 1500905619 +0000

Merge "Revert "Removed overlay from target"" into oc-dr1-dev
am: 8a7f2128b3

Change-Id: Ic108bd9ffcb6201671764d4dccdd6b460ad29f1e