Brian Carlstrom e2cd6bd66e am d928416d: am 5b19e7f4: am 0830d164: Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev ...

* commit 'd928416d76d9c7ecefa1d289bb69e17a7948ec7e':
  Move SystemBackupAgent from services.jar to frameworks.jar

2014-08-22 17:27:23 +00:00

..

java

am d928416d: am 5b19e7f4: am 0830d164: Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev

2014-08-22 17:27:23 +00:00

jni

am 7f42fe30: am f325858e: am fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev

2014-08-22 03:42:12 +00:00

res

Merge "Import translations. DO NOT MERGE"

2014-08-22 16:41:28 +00:00

tests

follow up minor fixes for connectivity manager test

2014-08-20 17:40:18 -07:00