tree 626c3aa16cb0c44193d9be35015cffa4bbacda74
parent 246a7ee4cc7205200481ee6b3a1132e4040b0874
parent efc3f4d130ceb7cd94c71ebdc6a1ad85b0b37ad9
author Jiyong Park <jiyong@google.com> 1517967005 +0000
committer android-build-merger <android-build-merger@google.com> 1517967005 +0000

Merge "Support LOCAL_SDK_VERSION := core_current" am: c82c0a81ec am: d2e7e0d33d
am: efc3f4d130

Change-Id: I13ab7399a47443dd1aa8766416ad30efcb443d7e