Sungsoo Lim 5b65d3c990 am 33ff97e5: Merge "TIF: Add content ratings for Germany" into lmp-dev ...

* commit '33ff97e556455e77a2ed0b1d21f98a4868b72e3f':
  TIF: Add content ratings for Germany

2014-08-06 01:17:37 +00:00

..

java

Mark all Meta combos as system combos

2014-08-05 23:01:15 +00:00

jni

Add resize method for virtual displays

2014-08-05 21:10:03 +00:00

res

am 33ff97e5: Merge "TIF: Add content ratings for Germany" into lmp-dev

2014-08-06 01:17:37 +00:00

tests

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

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