Merge "Unifying method names and comments to security logging, not device logging...

author Rubin Xu <rubinxu@google.com>

Thu, 17 Mar 2016 11:23:54 +0000 (11:23 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 17 Mar 2016 11:23:55 +0000 (11:23 +0000)
author Rubin Xu <rubinxu@google.com>
Thu, 17 Mar 2016 11:23:54 +0000 (11:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 17 Mar 2016 11:23:55 +0000 (11:23 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
diff --cc core/jni/Android.mk
Simple merge
diff --cc core/jni/AndroidRuntime.cpp
Simple merge
author	Rubin Xu <rubinxu@google.com>
	Thu, 17 Mar 2016 11:23:54 +0000 (11:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 17 Mar 2016 11:23:55 +0000 (11:23 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/admin/DevicePolicyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/jni/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/jni/AndroidRuntime.cpp	patch \|	diff1 \|	diff2 \|	blob \| history