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

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

2014-08-04 19:20:36 +00:00

..

java

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

2014-08-04 19:20:36 +00: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 18:21:24 +00:00

tests

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

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