OSDN Git Service

Merge "Add dev options to set swXdp" into nyc-dev
authorJason Monk <jmonk@google.com>
Wed, 6 Apr 2016 13:20:07 +0000 (13:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Apr 2016 13:20:07 +0000 (13:20 +0000)
1  2 
res/values/strings.xml

Simple merge