Zoltan Szatmary-Ban 99d983b086 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev ...

automerge: b3e8ff0

* commit 'b3e8ff00c85f37686a45597636d546a5e2a32c26':
  Adding method to query backup manager service activity status

2014-11-21 15:26:51 +00:00

..

java

am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev

2014-11-21 15:26:51 +00:00

jni

resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 15:41:25 -08:00

res

am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev

2014-11-21 03:03:46 +00:00

tests

am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev

2014-11-21 02:43:06 +00:00