OSDN Git Service

Merge "Disable WebViewSetting for non-admin users." into nyc-dev
authorGustav Sennton <gsennton@google.com>
Thu, 12 May 2016 13:29:11 +0000 (13:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 May 2016 13:29:11 +0000 (13:29 +0000)
commit6e9836845f8193cd52590ebec402383f54a2a41e
tree9cdf9844cdc410e9a263e86fdd1a4edc38be70b7
parentee4865ba1484a5da8a2d2022dfc1b4a4c3fedd9e
parentf76993a9da046ac762ef6cd39b7eb0baa81e8871
Merge "Disable WebViewSetting for non-admin users." into nyc-dev
am: f76993a9da

* commit 'f76993a9da046ac762ef6cd39b7eb0baa81e8871':
  Disable WebViewSetting for non-admin users.

Change-Id: I08f5f7888ee22844aed287d27458149875b0320f
AndroidManifest.xml