tree d0730e974535201a7cba8edc683b66bcf8cb3db9
parent c8a176f72c180745aae9de0febccffe6252f3374
parent 445e7fa3de6db2a0f734d9dff9f20a74389877e1
author Jiyong Park <jiyong@google.com> 1519021181 +0000
committer android-build-merger <android-build-merger@google.com> 1519021181 +0000

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

Change-Id: I9d3e3283ea61926bfaf9b6bcf48c5999386c5492