Behdad Esfahbod ab42b32fb9 am 7dc6dcd4: Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev ...

* commit '7dc6dcd417c23159047082a891288775b9e778b2':
  Remove dependency on SkPaintOptionsAndroid

2014-08-07 19:36:43 +00:00

..

java

Fix issue @16555033: Battery history overflowing too much

2014-08-07 12:19:39 -07:00

jni

Remove dependency on SkPaintOptionsAndroid

2014-08-07 14:38:51 -04:00

res

am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev

2014-08-07 18:06:38 +00:00

tests

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

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