Dimitry Ivanov e3ca5ac40d Merge "Use nativeloader to load NativeActivity" ...

am: 317456bc52

* commit '317456bc520549cbc1ac4ad102df8b0d22b22a99':
  Use nativeloader to load NativeActivity

2015-12-11 12:41:22 -08:00

..

java

Merge "Use nativeloader to load NativeActivity"

2015-12-11 12:41:22 -08:00

jni

Merge "Use nativeloader to load NativeActivity"

2015-12-11 12:41:22 -08:00

res

Merge "Add support for locking the screen when the lid is closed" am: 9dc3c36c9c

2015-12-08 10:55:07 +00:00

tests

Remove framework from LOCAL_JAVA_LIBRARIES

2015-12-08 13:59:36 +00:00