Sami Kyostila 682a4e75f8 Merge "base: Convert libs/services/Android.mk into a blueprint"

2018-01-12 11:03:23 +00:00

..

java

Merge "base: Convert libs/services/Android.mk into a blueprint"

2018-01-12 11:03:23 +00:00

jni

Merge "Rename onException to onPartialImage"

2018-01-10 22:39:28 +00:00

proto/android

Update comments and bump batterystats version to 30.

2018-01-11 16:36:06 -08:00

res

Merge "Add strings for Wifi Wake enabled notifications."

2018-01-12 03:18:15 +00:00

tests

Merge "Make Linkify links clickable in nonselectable text."

2018-01-12 10:40:20 +00:00