tree 83be933062e44432e081fecf37c6c875e512cff0
parent b14a1abb76ce452b231f70d903163fe76d38c819
parent cf9472443d369727cb26260996f0a8bc645131e0
author Jiyong Park <jiyong@google.com> 1519021554 +0000
committer android-build-merger <android-build-merger@google.com> 1519021554 +0000

Merge "Build with core_current" am: 9b65b98ff5 am: 252be30b42
am: cf9472443d

Change-Id: I12ec6bdb2005d3e7fed26029b1d412d23f76439a