OSDN Git Service
Chih-Wei Huang [Tue, 10 Jan 2017 14:16:01 +0000 (22:16 +0800)]
Merge tag 'android-6.0.1_r74' into marshmallow-x86
Android 6.0.1 release 74
Maurice Lam [Fri, 2 Sep 2016 23:34:38 +0000 (16:34 -0700)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.
Bug:
31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
(cherry picked from commit
c94f2b93afa2db9d87f9d8e0dc0c8709f16a326d)
Chih-Wei Huang [Wed, 7 Sep 2016 05:55:35 +0000 (13:55 +0800)]
Merge tag 'android-6.0.1_r66' into marshmallow-x86
Android 6.0.1 release 66
Jason Monk [Thu, 30 Jun 2016 15:26:08 +0000 (11:26 -0400)]
Pre-setup restrictions DO NOT MERGE
- Prevent external tiles from system apps
- Don't let user settings run
- Disable help
Bug:
29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
Koushik Dutta [Thu, 28 Feb 2013 22:49:24 +0000 (14:49 -0800)]
Settings: Add Superuser entry
Squashed commit of the following:
Author: Koushik Dutta <koushd@gmail.com>
Switch to new Superuser
Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c
Author: Danny Baumann <dannybaumann@web.de>
Hide Superuser entry if root access for apps is disabled.
Change-Id: Ibb77ba5a0fccf22564a26b8b1e13f7762c65718e
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Development: Root for apps is unavailable if the su daemon isn't running
The superuser options are tied to the Superuser app variant we use,
which in turn is tied to the su daemon. No daemon, no menu options.
Change-Id: I41d58e62986759336ab38e67f26a558c2eed5aa3
Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c
Steve Kondik [Sun, 15 Jan 2012 01:05:59 +0000 (17:05 -0800)]
Add preference for enabling root access (3/3)
* Root over ADB is now disabled by default on non-eng builds
* Requires support in su binary and adbd
* Root access can be configured to use ADB only, apps only, or all
Change-Id: I132a35a31c676511db954ff19120fa6d3c795b23
Conflicts:
res/values/arrays.xml
res/values/strings.xml
src/com/android/settings/DevelopmentSettings.java
Settings: Make CM developer options additions respect the on/off toggle
This commit fixes the problem where, when dev options are turned off, our
CM customizations don't turn off with the rest of the options and the
dangerous option (root access) does not reset to a safe setting.
Change-Id: I879756ea353ce2940c05b224998fc1a945f2ceff
DevSettings: Fix the root-access toggle in eng builds
It was being unconditionally removed, put it back
Change-Id: I8eecab7353c59b224d917cc1710124f57656cf47
Chih-Wei Huang [Thu, 1 Oct 2015 17:01:48 +0000 (01:01 +0800)]
Add an option to control native bridge
Paulo Sergio Travaglia [Sun, 27 Sep 2015 01:35:48 +0000 (01:35 +0000)]
Create an EGL context for DeviceInfoSettings
In order to get Mesa / OpenGL ES info, an EGL context is required.
Without it, GLES20.glGetString returns NULL.
Lukasz Anaczkowski [Mon, 13 May 2013 15:11:12 +0000 (17:11 +0200)]
Add information about OpenGL driver version
Change-Id: Icf107642b6d84a85c90c7411d6e42e9b6c6ef739
Signed-off-by: Lukasz Anaczkowski <lukasz.anaczkowski@intel.com>
Daniel Leung [Wed, 2 May 2012 23:37:00 +0000 (16:37 -0700)]
Added Manufacturer to device info
Added an item to display manufacturer in device info page.
For: AIA-438
Change-Id: Iae28759653089cf6fc757c1f76b7ee39638144b0
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Svetoslav [Tue, 24 Nov 2015 19:31:13 +0000 (11:31 -0800)]
DO NOT MERGE Modify system settings: incorrect UI state
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:
25843134
Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit
356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
(cherry picked from commit
119d589ea5aa9c2ccc5164279d718a20d0865f20)
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
Preserve FRP lock if wiped during SUW
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
[resolves merge conflicts with ag/808069]
Bug:
25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
Sanket Padawe [Thu, 12 Nov 2015 22:55:51 +0000 (14:55 -0800)]
Uncheck checkbox for contact sharing by default for non carkit devices.
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug:
23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
Russell Brenner [Mon, 9 Nov 2015 19:35:42 +0000 (11:35 -0800)]
Block developer settings during SUW
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.
Bug:
25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
Jason Monk [Mon, 9 Nov 2015 21:56:46 +0000 (16:56 -0500)]
Null check queryIntentServices
Bug:
25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
Dianne Hackborn [Fri, 30 Oct 2015 00:32:28 +0000 (17:32 -0700)]
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Make sure the duration shown for z-ram is sane (the maximum of the
other process durations of that app).
Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130
Dianne Hackborn [Thu, 29 Oct 2015 20:34:51 +0000 (13:34 -0700)]
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Just distribute them across all of the running apps, by creating
an additional fake "z-ram" process for each of them.
Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686
Geoff Mendal [Wed, 28 Oct 2015 13:55:41 +0000 (08:55 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 14:03:05 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import
Jason Monk [Thu, 22 Oct 2015 22:32:08 +0000 (15:32 -0700)]
Fix crash in Settings from uninstall
Bug:
25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
Geoff Mendal [Wed, 21 Oct 2015 14:05:23 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9
Auto-generated-cl: translation import
Jason Monk [Tue, 20 Oct 2015 23:38:58 +0000 (19:38 -0400)]
Allow access to permissions, even if app has none
Bug:
24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
Michael Wright [Tue, 20 Oct 2015 17:23:40 +0000 (17:23 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:21:52 +0000 (17:21 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:21:43 +0000 (17:21 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev
Geoff Mendal [Tue, 20 Oct 2015 04:22:01 +0000 (21:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
Jeff Sharkey [Tue, 20 Oct 2015 00:22:05 +0000 (17:22 -0700)]
Hide empty data usage cycles.
When building list of historical data usage cycles, omit cycles
that don't contain any data usage. A bad NITZ or NTP fix may have
caused us to record some usage in 1970 or 2038, which would have
shown all the cycles in between. Now we hide empty cycles to keep
things clean.
Bug:
18282691
Change-Id: Ib04c95d1411400ba9967d311b59402a26d39cfe3
Jason Monk [Mon, 19 Oct 2015 23:48:15 +0000 (19:48 -0400)]
Hide SIM and IMEI for wifi only devices
Bug:
24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
Jeff Sharkey [Mon, 19 Oct 2015 23:41:53 +0000 (16:41 -0700)]
Clamp large data usage values.
Without clamping, they can wrap around to negative values and cause
all sorts of havok. 1TB ought to be enough for anyone: that's 3Mbps
for a solid month.
Bug:
24555152
Change-Id: If92c87f9920c3f05cd3ff2cc6630b1bbb65335b8
Geoff Mendal [Mon, 19 Oct 2015 14:27:20 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 14:25:38 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 13:04:28 +0000 (13:04 +0000)]
am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
99131cf64253cf997d8ee6e356843e376a141846':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:01:28 +0000 (13:01 +0000)]
am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
f191953c77af3c5b78e576a430577aaf050aa5f1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 12:21:10 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
Jason Monk [Fri, 16 Oct 2015 16:33:56 +0000 (16:33 +0000)]
Merge "Fix crashes in Settings" into mnc-dr-dev
Jeff Sharkey [Fri, 16 Oct 2015 16:14:47 +0000 (16:14 +0000)]
Merge "Bail if activity was destroyed." into mnc-dr-dev
Jason Monk [Fri, 16 Oct 2015 14:13:53 +0000 (10:13 -0400)]
Fix crashes in Settings
Fix problems from unsupported intents being launched through adb.
Remove the ones we can, fix the other.
Bug:
19634064
Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
Amit Mahajan [Wed, 14 Oct 2015 23:33:01 +0000 (23:33 +0000)]
Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
Jeff Sharkey [Wed, 14 Oct 2015 21:45:52 +0000 (14:45 -0700)]
Bail if activity was destroyed.
Bug:
24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
Erik Kline [Wed, 14 Oct 2015 17:37:52 +0000 (17:37 +0000)]
Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
Geoff Mendal [Wed, 14 Oct 2015 14:35:49 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 14 Oct 2015 14:34:20 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia691930a9cc7c1c69292023b397077faa42494f5
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Oct 2015 12:59:54 +0000 (12:59 +0000)]
am
67b0ffc8: (-s ours) am
8b6b589d: (-s ours) am
cec2a65a: (-s ours) am
26bb544f: (-s ours) am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
67b0ffc88ba0c7effc2f89fb457042bc471b3b98':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:53:54 +0000 (12:53 +0000)]
am
8b6b589d: (-s ours) am
cec2a65a: (-s ours) am
26bb544f: (-s ours) am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:49:34 +0000 (12:49 +0000)]
am
cec2a65a: (-s ours) am
26bb544f: (-s ours) am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
cec2a65a98161c6c69e373647f03745c59246097':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:45:51 +0000 (12:45 +0000)]
am
26bb544f: (-s ours) am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
26bb544ff277020444b79543302b015160ead18a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:40:45 +0000 (12:40 +0000)]
am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:30:54 +0000 (05:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Oct 2015 12:30:14 +0000 (12:30 +0000)]
am
c6d5ac0f: (-s ours) am
974dfc1f: (-s ours) Import translations. DO NOT MERGE
* commit '
c6d5ac0fb71fdeefb5eaee8dbd83f9e34e84ba91':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:23:45 +0000 (12:23 +0000)]
am
974dfc1f: (-s ours) Import translations. DO NOT MERGE
* commit '
974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:17:15 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01aed0db8e7a6e11ba4b2bd204d42bee53ccf586
Auto-generated-cl: translation import
Lorenzo Colitti [Tue, 13 Oct 2015 06:23:38 +0000 (15:23 +0900)]
Unconfigure the lockdown VPN if the user forgets its profile.
Currently, if the user clicks "forget" on the configuration
dialog for the profile that is currently being used by the
always-on VPN, we don't disable the lockdown VPN, and we crash
on next boot because ConnectivityService tries to start
LockdownVpnTracker with an invalid configuration.
Fix this by removing the LOCKDOWN_VPN variable in the keystore
(which disables the always-on VPN), and notifying
ConnectivityService.
Bug:
23625458
Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
Geoff Mendal [Mon, 12 Oct 2015 19:24:07 +0000 (12:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I324bc1847519b9058a6951a6ef63e5668e9746ba
Geoff Mendal [Mon, 12 Oct 2015 14:43:57 +0000 (14:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 12 Oct 2015 14:43:01 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib419916b4455d3b42a8a8b2395c14dba9afcc8a3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Oct 2015 13:14:14 +0000 (13:14 +0000)]
am
4accfd0b: (-s ours) am
1bd19dd1: (-s ours) am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
4accfd0b121d2b258bca301b16f62c1ac760d89c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:11:42 +0000 (13:11 +0000)]
am
1bd19dd1: (-s ours) am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
1bd19dd17e2038df6c374ca6ed48498de4dde730':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:04:48 +0000 (13:04 +0000)]
am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
0e3ffe7cce1ceeac9eeac839d41db40ba983f97d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:00:56 +0000 (13:00 +0000)]
am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
5fa0a93d3ed1ad838fd43a41f4df9703ae206345':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:55:33 +0000 (12:55 +0000)]
am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:37:43 +0000 (12:37 +0000)]
am
7d521a8f: (-s ours) am
f598d0bc: (-s ours) Import translations. DO NOT MERGE
* commit '
7d521a8ff28ac8bc6110bc6eaff38c58bb792ca0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:34:25 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5044b8f155b8256dedc8581f8c7147ffdd0d2bc
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Oct 2015 12:30:37 +0000 (12:30 +0000)]
am
f598d0bc: (-s ours) Import translations. DO NOT MERGE
* commit '
f598d0bcf70e27a14462bc5403c83822c5600945':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:21:40 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0eb630b2b5dec19d48787ff56367a3f05b41483a
Auto-generated-cl: translation import
Christopher Tate [Tue, 8 Sep 2015 22:41:08 +0000 (15:41 -0700)]
Disable app-link preferences for browser apps
Also make sure that the 'Clear defaults' action unsets the app's
standing as the default browser, when applicable.
Bug
23751034
Change-Id: I6131b763bfa76ba38d18cad2abbb35caffe789aa
Amit Mahajan [Mon, 5 Oct 2015 18:06:54 +0000 (11:06 -0700)]
Change to add user_visible field to Carriers table.
Also adding config to control if adding APNs is allowed.
Bug:
24519879
Bug:
24681288
Change-Id: I59466f5489606162a10e883ede378e575a189fb3
Geoff Mendal [Wed, 7 Oct 2015 15:45:36 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 7 Oct 2015 14:44:44 +0000 (07:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b42883202e9bc41fcd5b4bcc844db53e7ee6efd
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Oct 2015 13:07:48 +0000 (13:07 +0000)]
am
4f7f05a0: (-s ours) am
ad36aa0e: (-s ours) am
3963b980: (-s ours) am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
4f7f05a00bf1b909140119884b65373b6248c0db':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 13:01:25 +0000 (13:01 +0000)]
am
ad36aa0e: (-s ours) am
3963b980: (-s ours) am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
ad36aa0ed1b7ba2541d28bc447473e27f3d04e22':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:56:45 +0000 (12:56 +0000)]
am
3963b980: (-s ours) am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
3963b980bebacb58dd2ed57fd45b042a01f125a0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:51:18 +0000 (12:51 +0000)]
am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
793b2a2d444192ee587a643c88e535ebf0c98158':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:46:38 +0000 (12:46 +0000)]
am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
d4fd061d6e33abb96dd8a6cac2d14cdbca154ce9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:46:25 +0000 (12:46 +0000)]
am
35d2cf1c: (-s ours) am
b4a027d0: (-s ours) Import translations. DO NOT MERGE
* commit '
35d2cf1c0c75342b307fa90f1508741b10169c9f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:41:35 +0000 (12:41 +0000)]
am
b4a027d0: (-s ours) Import translations. DO NOT MERGE
* commit '
b4a027d07bdd6b488a0ca576f7369beb0cad17c6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:36:18 +0000 (05:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93b053134a71c4db60e58d3bf8fd9c43cd90cc9b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Oct 2015 12:23:13 +0000 (05:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifeb18585f7add2909ad50d12839ba920a76cf44c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Oct 2015 15:30:33 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 5 Oct 2015 14:42:17 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf5ad5766d6f6fbd163d612ad1314f62cf07cc1d
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Oct 2015 13:01:52 +0000 (13:01 +0000)]
am
a4cd63f6: (-s ours) am
03226257: (-s ours) am
45335b0c: (-s ours) am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
a4cd63f6cc3a835ab268a9854f5ea8d7f41342c0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:55:55 +0000 (12:55 +0000)]
am
03226257: (-s ours) am
45335b0c: (-s ours) am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
032262578565c928b47996d096f3518cf1f09aa7':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:52:33 +0000 (12:52 +0000)]
am
45335b0c: (-s ours) am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
45335b0c5eeaeb068af6c35bcaa25b08cf10db9d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:45:22 +0000 (12:45 +0000)]
am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
0070fbfe01eab83402949298188322f1168b5b3c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:41:50 +0000 (12:41 +0000)]
am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
f0338376779311f2ee0c709e9735dfe5e89cde56':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:34:59 +0000 (12:34 +0000)]
am
82c61b2d: (-s ours) am
010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '
82c61b2dd878eae9a30bd7953bf3e2390e1e5611':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:33:27 +0000 (05:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2aa93f9635911e98133a6ab0cbba1740c62551cf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Oct 2015 12:32:07 +0000 (12:32 +0000)]
am
010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '
010d2fcd2a4b8fda906ff0a0e04554475a45489c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:20:30 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I56f2a38c8fee8b9cc019538933dfeead37a14d75
Auto-generated-cl: translation import
Zach Kuznia [Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)]
Merge "Allow manual to be read from disk" into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 16:48:17 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 14:42:27 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefde97a2fb8e5db601673631195ddcb638e2a81f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 13:02:08 +0000 (13:02 +0000)]
am
0929be66: (-s ours) am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
0929be6613afbf01c313e94f019a0a3d30c9a0a4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:57:33 +0000 (12:57 +0000)]
am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
dffcc532693c4bc6e07cf05ac532148612a94176':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:51:15 +0000 (12:51 +0000)]
am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
c7b0a8162520ffedcfcddb86d1f0e394513b7cf1':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:47:04 +0000 (12:47 +0000)]
am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
49b491bb7634284a8622e48c88571aa59ba59ac7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:41:16 +0000 (12:41 +0000)]
am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
2e095fa263b0887fc55576b32625264e13fee4c7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:34:33 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80d2cc4534deffcec5bd3f7566e19a2107ead775
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 12:33:46 +0000 (12:33 +0000)]
am
afc38312: (-s ours) am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
afc3831267c426974119608bb6c9179223532e47':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:27:22 +0000 (12:27 +0000)]
am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
77fc6ac5f6bb2c059f15b0bc9fd1ff02102b02fa':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:21:29 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27cf12c7d6f311ec58e53d5b762c980641361541
Auto-generated-cl: translation import
OSDN Git Service
