resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp

Change-Id: I012bd3b5946dedba3439285caa93739d44ebc60f

diff --cc core/jni/Android.mk
index c24f6c6,0b6a3a6..b5a2f98
--- 1/core/jni/Android.mk
--- 2/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@@ -65,7 -65,8 +65,8 @@@ LOCAL_SRC_FILES:= 
        android_os_MemoryFile.cpp \
        android_os_MessageQueue.cpp \
        android_os_ParcelFileDescriptor.cpp \
 -      android_os_Power.cpp \
 +      android_os_Parcel.cpp \
+       android_os_SELinux.cpp \
        android_os_StatFs.cpp \
        android_os_SystemClock.cpp \
        android_os_SystemProperties.cpp \

diff --cc core/jni/AndroidRuntime.cpp
index 241a905,31c1120..7a23747
--- 1/core/jni/AndroidRuntime.cpp
--- 2/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@@ -131,8 -131,11 +131,9 @@@ extern int register_android_nio_utils(J
  extern int register_android_text_format_Time(JNIEnv* env);
  extern int register_android_os_Debug(JNIEnv* env);
  extern int register_android_os_MessageQueue(JNIEnv* env);
 +extern int register_android_os_Parcel(JNIEnv* env);
  extern int register_android_os_ParcelFileDescriptor(JNIEnv *env);
 -extern int register_android_os_Power(JNIEnv *env);
+ extern int register_android_os_SELinux(JNIEnv* env);
  extern int register_android_os_StatFs(JNIEnv *env);
  extern int register_android_os_SystemProperties(JNIEnv *env);
  extern int register_android_os_SystemClock(JNIEnv* env);
@@@ -1146,8 -1153,9 +1147,9 @@@ static const RegJNIRec gRegJNI[] = 
      REG_JNI(register_android_os_FileUtils),
      REG_JNI(register_android_os_MessageQueue),
      REG_JNI(register_android_os_ParcelFileDescriptor),
 -    REG_JNI(register_android_os_Power),
+     REG_JNI(register_android_os_SELinux),
      REG_JNI(register_android_os_StatFs),
 +    REG_JNI(register_android_os_Trace),
      REG_JNI(register_android_os_UEventObserver),
      REG_JNI(register_android_net_LocalSocketImpl),
      REG_JNI(register_android_net_NetworkUtils),