Merge "Remove dependency on libnativehelper/JniConstants.h" am: 7fbba6bbbc
am: 48d9a1c75b

Change-Id: I415dd08b276f808e7c1af4582afa28e9da886276
tree: ba59d49bb71ac73b3f3462a22525b0ca99871fbb
  1. service/
  2. PREUPLOAD.cfg