Alan Viverette 0e7c022601 Merge "Add single-arg TextView.setTextAppearance, deprecate two-arg method"

2015-03-18 00:34:38 +00:00

..

java

Merge "Add single-arg TextView.setTextAppearance, deprecate two-arg method"

2015-03-18 00:34:38 +00:00

jni

Merge "Fix missing printf argument."

2015-03-18 00:07:45 +00:00

res

am 81c47fc2: am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev

2015-03-17 19:06:58 +00:00

tests

Merge "NetworkStats to support VPN accounting."

2015-03-12 22:10:56 +00:00