From: Doris Ling <dling@google.com>
Date: Sat, 1 Apr 2017 02:08:25 +0000 (+0000)
Subject: Merge "Update text for USB mode selection dialog." into oc-dev
X-Git-Tag: android-x86-8.1-r1~113^2~241
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8a6d2ed429;p=android-x86%2Fpackages-apps-Settings.git

Merge "Update text for USB mode selection dialog." into oc-dev
am: 23accd2179

Change-Id: Ia48fba32cdbd027ffe052016b0d8d3f3ee250993
---

8a6d2ed429ce77b04da9f3e92746ff0bae76e9a9