Bo Hu 4dc580c0df Merge "Emulator: Replace ro.kernel.qemu.gles with qemu.gles" into nyc-dev

2016-02-23 21:46:33 +00:00

..

java

Merge "Removed warning icons and use friendlier locale names" into nyc-dev

2016-02-23 21:37:05 +00:00

jni

Merge "Emulator: Replace ro.kernel.qemu.gles with qemu.gles" into nyc-dev

2016-02-23 21:46:33 +00:00

res

Merge changes from topic \'notification\' into mm-wireless-dev

2016-02-23 21:40:52 +00:00

tests

Make getBatteryUptimeLocked protected so it can be mocked.

2016-02-23 13:28:03 -08:00