tree 535edb4673a6ef05d4a72fe973572c78e8a468d5
parent 7728849a39e9c4644a3e732bb668a58913fb8557
parent c95dca8ce1bc58a015a938afcfc3e595d1bca16b
author TreeHugger Robot <treehugger-gerrit@google.com> 1501686517 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501686517 +0000

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master