OSDN Git Service

Merge "Add optional regulatory info page" into jb-mr1-dev
authorBrian Muramatsu <btmura@google.com>
Tue, 18 Sep 2012 21:59:35 +0000 (14:59 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Sep 2012 21:59:36 +0000 (14:59 -0700)
1  2 
res/values/strings.xml

Simple merge