Hector Dearman d2ee561f69 am 814e2f65: am 37fcb962: am 41d1648f: Merge "Fix CookieSyncManager package summary" into lmp-dev ...

* commit '814e2f65ebf4a5fc5da9aeee5cc18600d5e35952':
  Fix CookieSyncManager package summary

2014-08-05 16:17:45 +00:00

..

java

am 814e2f65: am 37fcb962: am 41d1648f: Merge "Fix CookieSyncManager package summary" into lmp-dev

2014-08-05 16:17:45 +00:00

jni

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

2014-08-04 18:37:59 +00:00

res

am a9fc53a1: am ccf44a00: am 291e9b9d: Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev

2014-08-05 13:26:43 +00:00

tests

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

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