tree 58417b4ccab8f9f1014b76e523a378c5eedf5f9d
parent 970fce609e5995bd40189ed59872474b7afa08c2
parent 181f26f63cedb1212941237a40a1b27e3339ea8f
author Logan Chien <loganchien@google.com> 1516851453 +0000
committer android-build-merger <android-build-merger@google.com> 1516851453 +0000

Merge "vndk-def: Merge SP-NDK into LL-NDK" am: 7a56aa9fe7
am: 181f26f63c

Change-Id: Iaaafd630ef319d996fce6290f4b2aaf3bcaac29b