Dan Sandler 2f99ca32db am 90ac386b: Merge "Deal more gracefully with null smallIcons." into mnc-dev ...

* commit '90ac386b4e4ee2679a2b7af83642ab74967c51e3':
  Deal more gracefully with null smallIcons.

2015-05-20 14:14:50 +00:00

..

java

Merge "Deal more gracefully with null smallIcons." into mnc-dev

2015-05-20 14:04:36 +00:00

jni

Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev

2015-05-19 17:58:11 +00:00

res

am 6246ade0: Merge "Remove controlBackground attribute, replace with direct reference" into mnc-dev

2015-05-19 17:19:44 +00:00

tests

Set NLM_F_ACK in our RTM_NEWNEIGH requests

2015-05-20 16:46:30 +09:00