Jeff Sharkey c57fc4787f Merge "Ignore wildcard network policies." into nyc-dev

2016-03-21 21:11:57 +00:00

..

java

Merge "Ignore wildcard network policies." into nyc-dev

2016-03-21 21:11:57 +00:00

jni

Merge "Revert "Move text logic from jni to hwui level"" into nyc-dev

2016-03-21 21:06:47 +00:00

res

Import translations. DO NOT MERGE

2016-03-21 08:29:09 -04:00

tests

Merge "Don't copy Bitmaps when cloning RemoteViews" into nyc-dev

2016-03-21 19:03:51 +00:00