Julia Reynolds 487295103d Merge "Inflate and strip remote views for pre-N apps." into nyc-dev am: 4bb2de2557 ...

am: 3c2ed58ff0

* commit '3c2ed58ff01b5443c6d29f5bf873a28062fe0715':
  Inflate and strip remote views for pre-N apps.

2016-02-18 19:00:55 +00:00

..

java

Merge "Inflate and strip remote views for pre-N apps." into nyc-dev am: 4bb2de2557

2016-02-18 19:00:55 +00:00

jni

Merge "Update Region parcelling to use SkRegion::Iter" into nyc-dev

2016-02-17 21:07:42 +00:00

res

Merge "Update protected broadcasts used by NFC." into nyc-dev am: 087fd6829d

2016-02-18 18:42:41 +00:00

tests

Make BackupManager encryption aware.

2016-02-17 16:34:29 -07:00