tree 996bb8e2e3ad1e9f3b4962784ac83f4c507e99ee
parent e17aa091366feafed96adc418a8a4699cf870917
parent fe028b0d0f0c3c0d31e1c11a640dcd52316f53b0
author Steven Moreland <smoreland@google.com> 1502487660 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502487660 +0000

Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master