tree 4239bcaee7032274b2a45bd4b840b5e4506096c6
parent 16f10f2aafbd6ad7656426a6a6fbddbd523cea6d
parent 1715340334ba965b047c9f104bd3ff268899992f
author Treehugger Robot <treehugger-gerrit@google.com> 1496984205 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1496984207 +0000

Merge changes I526f653e,Iefacd446

* changes:
  vndk-def: Add libz.so back to LL-NDK
  vndk-def: Add libandroid_net to LL-NDK