Antonio Cansado 7e098af672 Merge "Implementation of data usage callbacks." into nyc-dev ...

am: 12d7ea815b

* commit '12d7ea815b772b1013f9f5a583d296701a702a0c':
  Implementation of data usage callbacks.

2016-02-18 20:53:58 +00:00

..

java

Merge "Implementation of data usage callbacks." into nyc-dev

2016-02-18 20:53:58 +00:00

jni

Merge "Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""" into nyc-dev

2016-02-18 19:06:20 +00:00

res

Merge "Update protected broadcasts used by NFC." into nyc-dev

2016-02-18 18:29:53 +00:00

tests

Make BackupManager encryption aware.

2016-02-18 10:54:11 -07:00