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

am: c57fc47

* commit 'c57fc4787f5aadb129686e904b86d343c8ae3541':
  Ignore wildcard network policies.

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

..

java

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

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

jni

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

2016-03-21 21:12:05 +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