tree 83be933062e44432e081fecf37c6c875e512cff0
parent 705ba589944fb761bf49c440f540a682e94426e5
parent 252be30b42e3625ca7db60253ed4de5a684dbcb5
author Jiyong Park <jiyong@google.com> 1519021192 +0000
committer android-build-merger <android-build-merger@google.com> 1519021192 +0000

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

Change-Id: I4c4c41d094ddf8945d955ef346b49bcb01d3214d