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

* commit '04c5921c3e256f149d69d321b8729b2cf07840af':
  Give disappearing children a chance to recreate DisplayLists

2014-08-04 19:14:24 +00:00

..

java

Doze: Add a user opt-out setting.

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

jni

am 5a9b135f: am 20bac14e: Merge changes I69c064b0,I1972c5af

2014-08-04 18:37:59 +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