OSDN Git Service
Sudheer Shanka [Mon, 25 Jan 2016 22:39:34 +0000 (22:39 +0000)]
Add preference summary when disabled by admin.
Change-Id: Iaa84e66b0abe0fccde50f116cbf6e68c6abbabc0
Sudheer Shanka [Mon, 25 Jan 2016 21:04:13 +0000 (21:04 +0000)]
Merge "Add disabled by policy message as empty views in preferencefragment."
Jason Monk [Mon, 25 Jan 2016 20:36:56 +0000 (20:36 +0000)]
Merge "Add data saver to settings"
Jason Monk [Thu, 21 Jan 2016 19:12:11 +0000 (14:12 -0500)]
Add data saver to settings
Bug:
22817899
Change-Id: Ic3055aa6a5baae1653db350313366f180c049cc7
Geoff Mendal [Mon, 25 Jan 2016 18:55:43 +0000 (10:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3a891ae3544d89fd096c653c8f3c9792f14c5419
Auto-generated-cl: translation import
Mihai Nita [Mon, 25 Jan 2016 18:24:22 +0000 (10:24 -0800)]
Fix for build break (http://ag/844107)
The commit removed a string that was still used by AndroidManifest.xml
Change-Id: I32633546cfebcbb96066d80ff801c1d49b435f59
Geoff Mendal [Mon, 25 Jan 2016 15:38:38 +0000 (15:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
df9f6fc49d -s ours
am:
27fd447a4d -s ours
* commit '
27fd447a4d8fe4189cd20c046a2f3caa5887824a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:36:19 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
df9f6fc49d -s ours
* commit '
df9f6fc49d769835179343a2217cb9fc750d4942':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:34:28 +0000 (15:34 +0000)]
Import translations. DO NOT MERGE am:
13391af4fc -s ours am:
6142ec45b9 -s ours
am:
4b93474e68 -s ours
* commit '
4b93474e68b8e3a776ee29d70d035941b1ebe6bd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:34:18 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 25 Jan 2016 15:32:50 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iee1094b5b742ed2523dd83c8a362f3b889e035f6
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Jan 2016 15:32:29 +0000 (15:32 +0000)]
Import translations. DO NOT MERGE am:
13391af4fc -s ours
am:
6142ec45b9 -s ours
* commit '
6142ec45b92457e4119af1408a68bc92117935e8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:30:39 +0000 (15:30 +0000)]
Import translations. DO NOT MERGE
am:
13391af4fc -s ours
* commit '
13391af4fc4d095d2c94b388e441e34645ef7f68':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:24:17 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I24a034300aade7c9b389c92a29433347cac07070
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Jan 2016 14:54:16 +0000 (14:54 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Geoff Mendal [Mon, 25 Jan 2016 14:53:23 +0000 (14:53 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
098199b6144379c8321555b7f54ed55a443f3bbc.
Change-Id: Ie756851719c5324ef866be4a56f8d97180610e44
Geoff Mendal [Mon, 25 Jan 2016 14:36:37 +0000 (14:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 25 Jan 2016 14:34:44 +0000 (06:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I89b37a2718f15f037dfa28fb00e983568b1b1104
Auto-generated-cl: translation import
Benjamin Franz [Mon, 25 Jan 2016 14:11:26 +0000 (14:11 +0000)]
Move UserCredentialsTests to unit/
Change-Id: I17bf5fe982016ffc296ade198a74149dc0bd2ddf
Sudheer Shanka [Tue, 12 Jan 2016 10:36:18 +0000 (10:36 +0000)]
Add disabled by policy message as empty views in preferencefragment.
Change-Id: I296dc02c8e5cbea74f8415f4c8c5723f85e20b5b
Clara Bayarri [Mon, 25 Jan 2016 13:49:34 +0000 (13:49 +0000)]
Merge "Unify profile and device lock by setting the work lock on the device"
Clara Bayarri [Thu, 21 Jan 2016 11:43:08 +0000 (11:43 +0000)]
Unify profile and device lock by setting the work lock on the device
Bug:
26577742
Change-Id: I83cae9749d27637745c13f25ac19669b03a3c4bc
Clara Bayarri [Mon, 25 Jan 2016 13:33:06 +0000 (13:33 +0000)]
Merge "Fix Confirm/Choose Credentials strings related to profile"
Clara Bayarri [Fri, 22 Jan 2016 14:59:24 +0000 (14:59 +0000)]
Fix Confirm/Choose Credentials strings related to profile
The messages in ConfirmDeviceCredentials have been updated to
inform the user that the pattern/pin/password to be entered is
the profile one.
The strings in the confirmation dialog when the user removes
the lock have also been updated.
Ideally we would have a parametrized approach to strings here,
but capitalization makes it a hard problem.
Bug:
26706338,
26709116
Change-Id: I9f5508d6f449f9e572d65e5b2dcb15cca23832b3
Robin Lee [Mon, 25 Jan 2016 12:42:30 +0000 (12:42 +0000)]
Merge "Test: parcel marshalling for user credentials page"
Robin Lee [Mon, 25 Jan 2016 12:24:27 +0000 (12:24 +0000)]
Test: parcel marshalling for user credentials page
Unit test to verify that the internal Credential that gets passed to
dialogs for removing said credential is actually a valid Parcelable
object, since it's hard to provoke a marshal/unmarshal in real-world
usage (but not impossible).
Bug:
22541933
Change-Id: I780ca2d7b01fc6081b9ea8b2810cfc97f0433a86
Benjamin Franz [Mon, 25 Jan 2016 10:58:50 +0000 (10:58 +0000)]
Merge "Change build targets for settings tests"
Abodunrinwa Toki [Sat, 23 Jan 2016 15:36:49 +0000 (15:36 +0000)]
Merge "Change Input Settings UI flow."
Steve Pfetsch [Sat, 23 Jan 2016 01:43:33 +0000 (17:43 -0800)]
resolve merge conflicts of
259b6a8029 to master.
Change-Id: I5aa772839591d6f09d672a04ab8606fd39dd4a97
Steve Pfetsch [Fri, 22 Jan 2016 22:29:47 +0000 (22:29 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev am:
76b29667df
am:
5ff50f2072
* commit '
5ff50f2072880c76b6ad8486b5c35be9a39f9a29':
Added toast message to color temperature setting
Steve Pfetsch [Fri, 22 Jan 2016 22:21:34 +0000 (22:21 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
am:
76b29667df
* commit '
76b29667dff7b27151e450a05838913971f93c8f':
Added toast message to color temperature setting
Steve Pfetsch [Fri, 22 Jan 2016 22:07:54 +0000 (22:07 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
Oleksandr Peletskyi [Fri, 22 Jan 2016 20:31:41 +0000 (20:31 +0000)]
Merge "Added check of the restriction if a user is allowed to change their icon. BUG:
25305966"
Abodunrinwa Toki [Wed, 20 Jan 2016 18:43:20 +0000 (18:43 +0000)]
Change Input Settings UI flow.
1. Introduces new UI components as per the new flow
2. Temporarily disables components in the old flow that are to be
replaced by the new flow. This is done so we can neatly revert
to the old flow if there are issues with the new flow
3. AvailableVirtualKeyboardActivity now responds to
android.settings.INPUT_METHOD_SETTINGS intents instead of
InputMethodAndLanguageSettingsActivity
Bug:
25752812
Change-Id: I728d7ee185827ed328c16cb7abce244557a26518
Anna Galusza [Fri, 22 Jan 2016 17:56:19 +0000 (17:56 +0000)]
Merge "Make A11y SUW launchable from SUW and small UX changes based on last round of UX studies."
Robin Lee [Fri, 22 Jan 2016 17:46:02 +0000 (17:46 +0000)]
Merge "Convert credential view to DialogFragment"
Robin Lee [Tue, 19 Jan 2016 11:42:57 +0000 (11:42 +0000)]
Convert credential view to DialogFragment
Bug:
26352310
Change-Id: Ic6af37c893eec5a83e198b9f23ebd766e88e0109
Maurice Lam [Fri, 22 Jan 2016 17:17:38 +0000 (17:17 +0000)]
Merge "Use RestrictedRadioButton in SetupRedactionInterstitial"
Benjamin Franz [Mon, 18 Jan 2016 17:31:26 +0000 (17:31 +0000)]
Read work challenge background color from device policy
Call into DevicePolicyManager to retrieve the background color that
should be used for the work challenge on the user whose credential
screen we're about to show.
Change-Id: I612dd96020ce8932b49b21e6ff6faaddd39f957d
Benjamin Franz [Fri, 22 Jan 2016 12:27:00 +0000 (12:27 +0000)]
Merge "Add background image for work challenge"
Oleksandr Peletskyi [Mon, 18 Jan 2016 14:37:04 +0000 (15:37 +0100)]
Added check of the restriction if a user is allowed to change their icon.
BUG:
25305966
Change-Id: I35fda2e4f157463d69a109409c3f8767d54eab4a
Kenny Root [Fri, 22 Jan 2016 03:30:35 +0000 (19:30 -0800)]
resolve merge conflicts of
bdc6074276 to master.
Change-Id: Ieea1b33867acc7a6dd17f0340f30a66c29ce4359
Maurice Lam [Fri, 22 Jan 2016 02:09:43 +0000 (18:09 -0800)]
Use RestrictedRadioButton in SetupRedactionInterstitial
Bug:
26704975
Change-Id: I857dc0e57d1aaada06be4945b0e377291864ea89
Kenny Root [Thu, 21 Jan 2016 22:12:38 +0000 (22:12 +0000)]
Merge "Stop using AlgNameMapper"
am:
8646736618
* commit '
86467366183e7b7ca006456474cca50332213ca5':
Stop using AlgNameMapper
Kenny Root [Thu, 21 Jan 2016 21:53:11 +0000 (21:53 +0000)]
Merge "Stop using AlgNameMapper"
Jason Monk [Thu, 21 Jan 2016 19:15:46 +0000 (14:15 -0500)]
Fix build.
Change-Id: I43201fc9bb989d3f490ba26cb93956878745e366
Sudheer Shanka [Thu, 21 Jan 2016 19:07:02 +0000 (19:07 +0000)]
Merge "Add padlocks to preferences that can be disabled by policy."
Sudheer Shanka [Thu, 21 Jan 2016 18:46:17 +0000 (18:46 +0000)]
Merge "Add padlock to usb modes when disabled by admin."
Steve Pfetsch [Thu, 21 Jan 2016 01:48:13 +0000 (17:48 -0800)]
Added toast message to color temperature setting
Added a toast message to inform the user that the color temperature
setting is applied once the display is off.
Bug:
26110238
Change-Id: Ia773581eb441ed2f4ac44b20e611ad3700e8abbf
Sudheer Shanka [Wed, 20 Jan 2016 20:55:39 +0000 (20:55 +0000)]
Add padlock to usb modes when disabled by admin.
Change-Id: I8504febd78f083eb3ff88926fe29d69edc62b6ef
Clara Bayarri [Thu, 21 Jan 2016 17:50:17 +0000 (17:50 +0000)]
Merge "Fix bugs around unification when no password is set"
Andres Morales [Wed, 13 Jan 2016 23:28:54 +0000 (15:28 -0800)]
Track ro.flash.locked bit to enable/disable OEM unlocking pref
if the device is OEM unlocked already, disable the OEM
unlocking pref. If it's locked, enable.
Bug:
26039090
Change-Id: I915f3cf57deef8f5775d466dec59c891c1546b1b
Clara Bayarri [Wed, 20 Jan 2016 15:39:59 +0000 (15:39 +0000)]
Fix bugs around unification when no password is set
- When in a unified state, selecting the work lock to be "none" caused
a security exception
- When the work lock was set to "none", unifying didn't work
- When in a unified state, the work lock type selection screen showed
"none" as the current type instead of the device lock type
Bug:
26577247
Change-Id: I853d77186e23b6a458eaa6c1047942a7eefddc9c
Jason Monk [Thu, 21 Jan 2016 14:43:35 +0000 (09:43 -0500)]
Protect against missing subscriptions
Bug:
26676464
Change-Id: I428dd60e6774f7ca88423edb7a87e51ee8a7dadd
Benjamin Franz [Wed, 13 Jan 2016 12:16:25 +0000 (12:16 +0000)]
Add background image for work challenge
If the challenge shown is for a work profile, add the default image and
color to the background of the fragment.
Change-Id: I148c6cd3a835a84c7bac78b020839dfdae4a6c36
Benjamin Franz [Thu, 21 Jan 2016 12:27:36 +0000 (12:27 +0000)]
Change build targets for settings tests
1. Split existing tests into fully automatable (unit/) and not fully
automatable (app/)
2. Revert previous changes to test runners on app/
3. Fix some typos in readme
This will enable us to add the fully automatable test target
SettingsUnitTests to the continuous integration tests on the platform.
Change-Id: I0f42c59fde84891e4bfc379150c2f0c61ce1329f
Benjamin Franz [Thu, 21 Jan 2016 10:43:30 +0000 (10:43 +0000)]
Merge "Add unit tests to Utils"
Adam Lesinski [Thu, 21 Jan 2016 02:22:05 +0000 (02:22 +0000)]
Merge "Add bt traffic accounting"
Kenny Root [Wed, 20 Jan 2016 23:50:55 +0000 (15:50 -0800)]
Stop using AlgNameMapper
AlgNameMapper currently doesn't work after the transition to it being in
Conscrypt, so just get rid of it altogether.
Change-Id: I0e8b057915edcb584bd4470c43f3458efa49329e
Anna Galusza [Fri, 8 Jan 2016 22:37:16 +0000 (14:37 -0800)]
Make A11y SUW launchable from SUW and small UX changes based on last round of
UX studies.
Change-Id: I9c20cd3abf910a37731da2af604f3af2cd30e942
Sudheer Shanka [Wed, 20 Jan 2016 21:10:04 +0000 (21:10 +0000)]
Merge "Add restricted padlocks to radio buttons."
Sudheer Shanka [Wed, 20 Jan 2016 21:09:27 +0000 (21:09 +0000)]
Merge "Trigger a support dialog when an action is disabled by policy"
Sudheer Shanka [Fri, 15 Jan 2016 12:20:46 +0000 (12:20 +0000)]
Trigger a support dialog when an action is disabled by policy
Change-Id: I847b481a16cce33fe7bd4040d38ec50ca62172c2
Mihai Nita [Tue, 12 Jan 2016 16:55:05 +0000 (08:55 -0800)]
Implement multiple locales and sublocales in Settings
Does drag-and-drop reordering, supports adding / removing locales,
suggestions, search, removes locales already selected in the
user preferences.
Bug:
25800339
Change-Id: Iffe7b9810c77ec93a84d848ab20b2ba405249676
Benjamin Franz [Wed, 20 Jan 2016 12:20:15 +0000 (12:20 +0000)]
Add unit tests to Utils
1. Switch to AndroidJUnitRunner
2. Add mockito support
3. Add tests for Utils class
Change-Id: I1eabfdf1d65456d71363b8970beee9239a90ada2
Geoff Mendal [Wed, 20 Jan 2016 18:16:34 +0000 (18:16 +0000)]
Import translations. DO NOT MERGE am:
ffb0eb03a7 -s ours am:
97898c5cd2 -s ours
am:
a3bb93f1cc -s ours
* commit '
a3bb93f1ccc216159fa102ef3aca8cf7f0e22759':
Import translations. DO NOT MERGE
Sudheer Shanka [Wed, 20 Jan 2016 18:09:54 +0000 (18:09 +0000)]
Merge "Check for MANAGE_DEVICE_ADMINS permission instead of uids."
Geoff Mendal [Wed, 20 Jan 2016 17:52:58 +0000 (17:52 +0000)]
Import translations. DO NOT MERGE am:
ffb0eb03a7 -s ours
am:
97898c5cd2 -s ours
* commit '
97898c5cd2033c331b537d9b17205e09d991e56d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 17:50:13 +0000 (17:50 +0000)]
Import translations. DO NOT MERGE am:
bcefb0397f -s ours
am:
c42498eddb -s ours
* commit '
c42498eddb7b687b999f7a2795db8c46055f778c':
Import translations. DO NOT MERGE
Sudheer Shanka [Wed, 13 Jan 2016 22:10:18 +0000 (22:10 +0000)]
Add padlocks to preferences that can be disabled by policy.
Change-Id: I43b6b5954ef6ec65b86d99321cabab9f49df842d
Geoff Mendal [Wed, 20 Jan 2016 17:43:14 +0000 (17:43 +0000)]
Import translations. DO NOT MERGE
am:
bcefb0397f -s ours
* commit '
bcefb0397f06f52a50e994418ae590581e217428':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 17:41:58 +0000 (17:41 +0000)]
Import translations. DO NOT MERGE
am:
ffb0eb03a7 -s ours
* commit '
ffb0eb03a729758c6477a701c07f39121ee95872':
Import translations. DO NOT MERGE
Jason Monk [Wed, 20 Jan 2016 16:37:01 +0000 (16:37 +0000)]
Merge "Fix DataUsageSummary in no sim state."
Jason Monk [Wed, 20 Jan 2016 16:33:46 +0000 (11:33 -0500)]
Fix DataUsageSummary in no sim state.
Bug:
26676464
Change-Id: I7fad5240f1160a2eb38a7cff2ae2f1c9e40bc4d3
Sudheer Shanka [Fri, 8 Jan 2016 20:40:55 +0000 (20:40 +0000)]
Add restricted padlocks to radio buttons.
Change-Id: Ibaf312a4c6c5fd9126ab7d45ccb094fc1bd46a1f
Julia Reynolds [Wed, 20 Jan 2016 16:16:07 +0000 (16:16 +0000)]
Merge "Add default alarm ringtone to sound settings."
Julia Reynolds [Wed, 20 Jan 2016 16:10:49 +0000 (11:10 -0500)]
Add default alarm ringtone to sound settings.
Bug:
25957833
Change-Id: I68d6747894665c97853eabac7edb0f751d1fdcc1
Geoff Mendal [Wed, 20 Jan 2016 15:40:11 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfc8542b0e1f51163d9ff7f5327e851a08377d67
Auto-generated-cl: translation import
Geoff Mendal [Wed, 20 Jan 2016 15:31:39 +0000 (07:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie620b53b05ebf701b1279275da7c4090c14ed446
Auto-generated-cl: translation import
Geoff Mendal [Wed, 20 Jan 2016 14:42:26 +0000 (06:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idec70dd78b29ef60ecf1614853358f1c0b1c98c8
Auto-generated-cl: translation import
Jason Monk [Tue, 19 Jan 2016 19:03:19 +0000 (19:03 +0000)]
Merge "Update data usage UX"
Jason Monk [Mon, 11 Jan 2016 19:27:20 +0000 (14:27 -0500)]
Update data usage UX
Update the UX and dig the data usage screen out of a huge whole of
technical debt. Switch every to use Preferences rather than standard
layouts and ListViews.
Split data usage into several fragments, all separated.
DataUsageSummary:
- Shows a summary of the 'default' usage at the top, this will be
the default sim on phones, or wifi if it has it, or ethernet
as last attempt to show something.
- Also has individual categories for each network type that has
data, cell, wifi, and ethernet. Maybe should look into bt though?
DataUsageList:
- Takes a NetworkTemplate as an input, and can only be reached from
the network specific categories in DataUsageSummary
- Shows a graph of current usage for that network and links to
app detail page for any app.
- Has gear link to quick get to billing cycle screen if available
BillingCycleSettings:
- Just a screen with the cycle day and warning/limits separated
out from the data usage.
AppDataUsage:
- App specific data usage details
- May need some UX iteration given lack of clarity in the spec
Bug:
22459566
Change-Id: I0222d8d7ea7b75a9775207a6026ebbdcce8f5e46
Steve Pfetsch [Tue, 19 Jan 2016 18:30:11 +0000 (18:30 +0000)]
Merge "Enable color temperature developer setting"
Mahaver Chopra [Tue, 19 Jan 2016 18:20:34 +0000 (18:20 +0000)]
Merge "Work mode conditional switch in main settings"
Mahaver Chopra [Tue, 19 Jan 2016 18:19:15 +0000 (18:19 +0000)]
Merge "Added work mode in Settings->Accounts"
Sudheer Shanka [Tue, 19 Jan 2016 17:58:27 +0000 (17:58 +0000)]
Merge "Add padlocks to more preferences that can be disabled by policy."
Maurice Lam [Tue, 19 Jan 2016 17:45:46 +0000 (17:45 +0000)]
Merge "[RedactionInterstitial] Fix RTL text alignment"
Maurice Lam [Tue, 19 Jan 2016 17:42:25 +0000 (17:42 +0000)]
Merge "[WifiDialog] Suppress activity transition"
Mahaver Chopra [Wed, 13 Jan 2016 18:51:10 +0000 (18:51 +0000)]
Work mode conditional switch in main settings
Bug:
26533692
Change-Id: Ifa235bc54c2c6e904cb1cf4fab06d727cde2492a
Udam Saini [Tue, 19 Jan 2016 17:24:28 +0000 (17:24 +0000)]
Merge "Only display warning to user if we are enabling OEM"
Sudheer Shanka [Mon, 18 Jan 2016 11:17:23 +0000 (11:17 +0000)]
Add padlocks to more preferences that can be disabled by policy.
Change-Id: I7cc999dd1d46c20c888e0ba67053564e4d50946b
Adam Lesinski [Sat, 5 Dec 2015 01:01:23 +0000 (17:01 -0800)]
Add bt traffic accounting
Bug:
26039657
Change-Id: I8f8d0389b5b55e02b4a3528b010b76938d87a2a3
Sudheer Shanka [Mon, 18 Jan 2016 15:03:57 +0000 (15:03 +0000)]
Check for MANAGE_DEVICE_ADMINS permission instead of uids.
Currently, in ShowAdminSupportDetailsDialog we use uid check to
restrict only system to pass extras. Relaxing that condition to
allow any package with MANAGE_DEVICE_ADMINS permission to pass extras.
Change-Id: I0351c1f82321b2304a61b5831788806636402610
Geoff Mendal [Mon, 18 Jan 2016 15:45:57 +0000 (15:45 +0000)]
Import translations. DO NOT MERGE am:
c123a6a923 -s ours am:
550dd6e8dc -s ours
am:
6a19c5cabf -s ours
* commit '
6a19c5cabf1615ffce654a1203554bbaa1d1f72e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:45:46 +0000 (15:45 +0000)]
Import translations. DO NOT MERGE am:
bd620a7de1 -s ours
am:
12429ac8a7 -s ours
* commit '
12429ac8a7f14a349f5f8e278acd3a3cba568438':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:44:11 +0000 (15:44 +0000)]
Import translations. DO NOT MERGE am:
c123a6a923 -s ours
am:
550dd6e8dc -s ours
* commit '
550dd6e8dceaaf2fbb2ed7a24e221c24cd72ee7d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:44:00 +0000 (15:44 +0000)]
Import translations. DO NOT MERGE
am:
bd620a7de1 -s ours
* commit '
bd620a7de1b171ac54ce1268e12d1757c0baa86d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:41:49 +0000 (15:41 +0000)]
Import translations. DO NOT MERGE
am:
c123a6a923 -s ours
* commit '
c123a6a9230faf4800df67085b98bcd7badf4ca8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:40:39 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I91bced80bb025ac6d6599db0a48f2332cea70520
Auto-generated-cl: translation import
Geoff Mendal [Mon, 18 Jan 2016 15:32:09 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I415c6bc5d49ea34685d6219dfb8482294f17b692
Auto-generated-cl: translation import