tree e6adcf2ab67448c92d6cbd3de54e79ee6c75bc4e
parent 4a2cfffd33f5355581fb224f5e1a98ec0969a313
parent 49f9c969eb9efe48ae8e5770767dc3a817e1bb8d
author Tianjie Xu <xunchang@google.com> 1496267838 +0000
committer android-build-merger <android-build-merger@google.com> 1496267838 +0000

Merge "kill package_extract_dir" am: 99e7216907
am: 49f9c969eb

Change-Id: If8936fb2b090b83ad6fba39668d60e324662a42e