tree 83be933062e44432e081fecf37c6c875e512cff0
parent 4eb5ada96de4ac075d15bc9b775c9c6fb6b6d61c
parent 9b65b98ff582d7245cf21f15ecddf25067eaccfc
author Jiyong Park <jiyong@google.com> 1519020801 +0000
committer android-build-merger <android-build-merger@google.com> 1519020801 +0000

Merge "Build with core_current"
am: 9b65b98ff5

Change-Id: I60e8d94c835cc399bed23bebad22c436d9aa2b7a