Christopher Tate 3f7cc50fc7 am 7c8f2d5d: Merge "API to tell the transport to cancel a full backup in progress" into lmp-dev ...

* commit '7c8f2d5d967843c4bac0ae9d4408bf7ccf51690d':
  API to tell the transport to cancel a full backup in progress

2014-08-07 23:20:17 +00:00

..

java

API to tell the transport to cancel a full backup in progress

2014-08-07 23:16:19 +00:00

jni

Remove dependency on SkPaintOptionsAndroid

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

res

am 8e7cefa8: Merge "Add descriptions to MediaController buttons" into lmp-dev

2014-08-07 23:20:12 +00:00

tests

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

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