From: Brian Muramatsu <btmura@google.com>
Date: Tue, 18 Sep 2012 21:59:35 +0000 (-0700)
Subject: Merge "Add optional regulatory info page" into jb-mr1-dev
X-Git-Tag: android-x86-4.4-r1~634^2~3^2~173
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a6c1b346;p=android-x86%2Fpackages-apps-Settings.git

Merge "Add optional regulatory info page" into jb-mr1-dev
---

a6c1b346ae0fc92170eb09f90c71b9c3d25d53eb