tree b9fa351036d2085c82e1dd29638e55f33f592e87
parent 75b43b74009e17c34e176e4273543a501f187bd8
parent 5ba8a7a6ec65dfca9cae58da8269b7addf5d84c1
author Weichin Weng <weichinweng@google.com> 1554171244 -0700
committer android-build-merger <android-build-merger@google.com> 1554171244 -0700

[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist""
am: 864fe7ad39 -s ours
am skip reason: subject contains skip directive

Change-Id: I5c1ff1bbe0f3c7fc665e6f89d4eabebecd26a961