OSDN Git Service

Merge "wifi-display: add certification options" into klp-dev
authorChong Zhang <chz@google.com>
Fri, 23 Aug 2013 23:19:18 +0000 (23:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 23 Aug 2013 23:19:18 +0000 (23:19 +0000)
commit5114444eca4e62f32cc85b9740dc0c66f87d5d99
tree7b14efacd603de244e62f36713eebf0b61492460
parenta0aee43e8463516ded9b3ab784d53bdf9ccf87c2
parent6c607384c478958260952b82932b9084a4536fc6
Merge "wifi-display: add certification options" into klp-dev
res/values/strings.xml
src/com/android/settings/DevelopmentSettings.java