Nicolas Prevot 9e24e5d513 am 95559c12: Merge "Security fixes related to cross-user content." into lmp-dev ...

* commit '95559c12f8350eb43373762a1335441187cf97d3':
  Security fixes related to cross-user content.

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

..

java

Security fixes related to cross-user content.

2014-08-05 17:05:09 +00:00

jni

Add fontFeatureSettings to TextView and attrs

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

res

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

2014-08-05 13:06:31 +00:00

tests

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

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