Samuel Tan 739f85b433 Merge "Remove config_wifi_hal_pno_enable and config_wifi_ssid_white_list_enable" into nyc-dev ...

am: 143a933

* commit '143a9333dc5779d062a9af615774c6f332e6dbca':
  Remove config_wifi_hal_pno_enable and config_wifi_ssid_white_list_enable

Change-Id: I339f805bdd609299032b845c5dc0934ee0a65561

2016-04-12 17:24:12 +00:00

..

java

Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev

2016-04-12 17:24:10 +00:00

jni

Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev

2016-04-12 14:45:44 +00:00

res

Merge "Remove config_wifi_hal_pno_enable and config_wifi_ssid_white_list_enable" into nyc-dev

2016-04-12 17:24:12 +00:00

tests

Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev

2016-04-12 00:43:08 +00:00