Alan Viverette 1a37f9b74c am 9cfe1e3c: Merge "Delete file containing removed attributes and styles" into lmp-dev ...

* commit '9cfe1e3c2785b78da86f450b9240b743842e65c2':
  Delete file containing removed attributes and styles

2014-09-19 16:27:21 +00:00

..

java

Merge "Allow primary user profile owner to set device restrictions" into lmp-dev

2014-09-19 15:51:39 +00:00

jni

Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev

2014-09-19 02:00:26 +00:00

res

am 9cfe1e3c: Merge "Delete file containing removed attributes and styles" into lmp-dev

2014-09-19 16:27:21 +00:00

tests

NetworkStats always needs arrays.

2014-09-17 09:26:31 -07:00