tree 64ae29baf363a6c020f3756272b4a9060c145bf1
parent 74812032f8d8eddbef387f18c96de9e5c38b8fdb
parent 667b8866dbf994510526326fc03cea14613a00b4
author Andreas Gampe <agampe@google.com> 1526441977 -0700
committer android-build-merger <android-build-merger@google.com> 1526441977 -0700

Merge "JLine: convert to soong" am: abf7aa1401
am: 667b8866db

Change-Id: Icc76adcf2c6a2f5f6d199f7343eb69c0bc84b3a8