Chong Zhang 411af374f9 am dbb0b824: Merge "wifi-display: add a global setting to force WPS config method" into klp-dev ...

* commit 'dbb0b824a7e1dc6909988ec06a46158c05d26a92':
  wifi-display: add a global setting to force WPS config method

2013-09-04 15:11:33 -07:00

..

java

am dbb0b824: Merge "wifi-display: add a global setting to force WPS config method" into klp-dev

2013-09-04 15:11:33 -07:00

jni

am 4c92f7ce: Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev

2013-09-04 10:37:49 -07:00

res

am 2cf8138b: Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev

2013-09-04 07:19:05 -07:00

tests

Merge "Use core-tests-support instead of core-tests" into klp-dev

2013-08-30 23:21:27 +00:00