Jorim Jaggi c5f88e6872 Merge changes I46e93397,Ie0a157a9 into pi-dev ...

am: 3a78ec6ae4

Change-Id: Iab137d16d15e47fa63016d3f3f4702aa727d7ccd

2018-03-09 14:38:38 +00:00

..

java

Merge changes I46e93397,Ie0a157a9 into pi-dev

2018-03-09 14:38:38 +00:00

jni

Merge "Stop using finalizer in Typeface and FontFamily" into pi-dev

2018-03-08 21:16:47 +00:00

proto

Merge "Documenting some core proto style conventions." into pi-dev

2018-03-09 05:15:28 +00:00

res

Merge "Display shortcut inline with item title in cascading menu" into pi-dev

2018-03-09 14:29:00 +00:00

tests

Merge "Add global setting for auto-battery saver threshold max" into pi-dev

2018-03-09 03:51:41 +00:00