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)
commita6c1b346ae0fc92170eb09f90c71b9c3d25d53eb
tree2cd790947b56931842a3bc2bd8ba9864ca4d367e
parent7956e7263afd2007dc4262dc3c79dc74b14e8bf6
parenta6dbaea2dacaaef7c91f89aae8d5f1ed7580b893
Merge "Add optional regulatory info page" into jb-mr1-dev
res/values/strings.xml