tree d0730e974535201a7cba8edc683b66bcf8cb3db9
parent 56d135ba754cb45db43d56f8b6288df5c10e087d
parent ebbf628d0ef87335e6e7107d6d233c28dcffa2af
author Jiyong Park <jiyong@google.com> 1519021543 +0000
committer android-build-merger <android-build-merger@google.com> 1519021543 +0000

Merge "Build with core_current" am: 56dce0b1b7 am: 445e7fa3de
am: ebbf628d0e

Change-Id: Ia3b89d23a932ae4d571920291e28d1a6b7592784