Chet Haase 944ca2dfd3 am 7c98f923: Merge "Give disappearing children a chance to recreate DisplayLists" into lmp-dev ...

* commit '7c98f92375c8037b513b58f84d627dc592c7005d':
  Give disappearing children a chance to recreate DisplayLists

2014-08-04 19:10:30 +00:00

..

java

Doze: Add a user opt-out setting.

2014-08-04 14:57:06 -04:00

jni

Add fontFeatureSettings to TextView and attrs

2014-08-01 21:35:05 +00:00

res

Import translations. DO NOT MERGE

2014-08-04 09:39:20 -07:00

tests

Revert "Revert "Service data and manufacturer data can be repeated fields.""

2014-08-01 11:12:37 -07:00