tree 4796a321cc74aa84638ef04805730728b45f4770
parent fa5467efd7b02185711255ea83bbdc78dbdb91d0
parent 3a7ae4462c08d45038f9121644481ae5fae66ae4
author Dan Albert <danalbert@google.com> 1516761444 +0000
committer android-build-merger <android-build-merger@google.com> 1516761444 +0000

Merge "Include libz.a in the NDK." am: 0d8ec3aa93 am: d14e79874d
am: 3a7ae4462c

Change-Id: I13d82beb6aa880836c1ffa8399cd298c0a69ecd6