summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yifan Hong <elsk@google.com> 2017-01-14 01:05:04 +0000
committer android-build-merger <android-build-merger@google.com> 2017-01-14 01:05:04 +0000
commit1bc9d241f66abe7e61b8d7cf7964bbd2e13e2761 (patch)
treed6316324393c13ff6fc216bcaee1bffc4c3a6471
parent3102b3c37f7273fd363a41d1b23d2d4fa7df7a54 (diff)
parent24b33094f6c05d7e218359928969489efb9b8fb5 (diff)
Merge "BBinder -> BHwBinder." am: fe4d257887 am: 051b14106f
am: 24b33094f6 Change-Id: I4781adad935ca77148226e0ed7df5f0b5b953daa
-rw-r--r--core/jni/android_os_HwBinder.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_os_HwBinder.h b/core/jni/android_os_HwBinder.h
index 2ebc38164da8..fa8fe01d6e93 100644
--- a/core/jni/android_os_HwBinder.h
+++ b/core/jni/android_os_HwBinder.h
@@ -24,7 +24,7 @@
namespace android {
-struct JHwBinder : public hardware::BBinder {
+struct JHwBinder : public hardware::BHwBinder {
static void InitClass(JNIEnv *env);
static sp<JHwBinder> SetNativeContext(