tree 1cdb2045f8af09a17c67ef2253e45d83ba52818e
parent b9666117e80c698f022e21fe1264b7663a6a0dab
parent a5f81be0f73ea9001e499c92ad4e7c6cca85e971
author Dan Willemsen <dwillemsen@google.com> 1509589378 +0000
committer android-build-merger <android-build-merger@google.com> 1509589378 +0000

Merge "Remove extras to fix tapas on AOSP"
am: a5f81be0f7

Change-Id: Ifbaa49951f105f6b07999ce405c8e86b30ef3208