OSDN Git Service

Merge "Add dev options to set swXdp" into nyc-dev am: b22dd20
authorJason Monk <jmonk@google.com>
Wed, 6 Apr 2016 13:31:44 +0000 (13:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Apr 2016 13:31:44 +0000 (13:31 +0000)
commit9964504e51de71d93a9aa35b2d965cc9ac25d66c
tree96cb4d17b07bb9c65a0d09b93a7eb5b1663012de
parent67691696f29fdd0bb7f42d01b3a4ce82da751aa3
parent51970c855812232a9514958dd67959f18749fbe1
Merge "Add dev options to set swXdp" into nyc-dev am: b22dd20
am: 51970c8

* commit '51970c855812232a9514958dd67959f18749fbe1':
  Add dev options to set swXdp

Change-Id: Id25b198c9af3e7b6eca478c3936341096d5edd2e
res/values/strings.xml