commit 7bda98c16961b28f89786c7b4cd18ad476998e8d
author Android Build Merger (Role) <android-build-merger@google.com> Fri Jun 09 22:35:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 09 22:35:56 2017 +0000
tree 840d363a2b7808a7459d690f8bf7a7558feb6bc5
parent 74b23e7eb57d00bb5a1d3bd5078113a1c45f6401
parent 9dbaf26545ae7a3566269c42237414c814c5c5ad

Merge changes from topic 'am-b47e60cad28b4cbe812b099eb066391f' into oc-dr1-dev-plus-aosp

* changes:
  vndk-def: Add tag file support to deps-insight am: 08d4dc40b6  -s ours am: 19a111ce1b  -s ours
  vndk-def: Add more output formats to vndk command am: 7f127196dc  -s ours am: 56285ae43e  -s ours
  vndk-def: Simplify VNDK result am: 840177d510  -s ours am: ef8a419e16  -s ours
  vndk-def: Remove "follow" from default action am: 8a13cdab4c  -s ours am: 076956edec  -s ours
  vndk-def: Add libz.so back to LL-NDK am: 677d03d481  -s ours am: e36a58418e  -s ours
  vndk-def: Add libandroid_net to LL-NDK am: b9a941830d  -s ours am: 83b827db36  -s ours