Wale Ogunwale bc4f4e5be6 Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev ...

am: 13059cc2ad

Change-Id: I079d34636465188b0d2bd231c798c44343bbc3b5

2017-06-08 14:41:34 +00:00

..

java/com/android/server

Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev

2017-06-08 14:41:34 +00:00

jni

Merge "Revert "Revert "power hal: Use power HAL API 1.1"""

2017-06-06 16:01:55 +00:00

Android.mk

Add tethering offload HAL call via JNI

2017-05-17 13:44:25 +09:00