OSDN Git Service
Julia Reynolds [Tue, 2 Feb 2016 20:11:59 +0000 (15:11 -0500)]
Don't require apps to call showLights to use default lights.
Bug:
26810573
Change-Id: I431a1a18e32c616238e763b401b5f6b14131fd89
Julia Reynolds [Tue, 2 Feb 2016 15:24:30 +0000 (10:24 -0500)]
Allowing querying for apps with blocked topics.
Bug:
26882239
Change-Id: If888cb18891a412067bcb28e575f502c6091f77a
Ritesh Reddy [Tue, 2 Feb 2016 14:18:23 +0000 (14:18 +0000)]
Merge "Constrained allowable backup versions"
Narayan Kamath [Tue, 2 Feb 2016 12:08:20 +0000 (12:08 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 12:03:53 +0000 (12:03 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 11:55:59 +0000 (11:55 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 11:55:34 +0000 (11:55 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 11:54:01 +0000 (11:54 +0000)]
Track libcore change
f35c08530f77a744646e6e988d330a68f3af6940.
Change-Id: I53bb912e7b7d6510952da8b121402628fa3f922d
Ritesh Reddy [Tue, 2 Feb 2016 11:42:26 +0000 (11:42 +0000)]
Constrained allowable backup versions
Constrained the version on an incoming backup set
to the highest version that the SettingsBackupAgent
can handle. This is to deal with either corrupted backup
sets or newer backup sets (when modifiying/downgrading the
SettingsBackupAgent).
Change-Id: I4d666e8d4541c0b86e656a73744837d03318c4ae
Narayan Kamath [Tue, 2 Feb 2016 11:40:12 +0000 (11:40 +0000)]
Track libcore change
fe6fe17d1ca75ee039df7ab93314f3f1e068794f.
Change-Id: Ib0e5efc903fe522fb2bc314b9000a26e90a4ea57
Victor Chang [Tue, 2 Feb 2016 11:02:07 +0000 (11:02 +0000)]
Merge "Fix that can't launch managed QuickContact in ContactSearch"
Daichi Hirono [Tue, 2 Feb 2016 10:14:27 +0000 (10:14 +0000)]
Merge "Mount appfuse in process namespace."
Narayan Kamath [Tue, 2 Feb 2016 09:41:12 +0000 (09:41 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC" am:
21b2b7306e
am:
7b33488e12
* commit '
7b33488e124bbe2a9fcfa6cd7a78726bc932ac8b':
Alarm: add missing closedir after opendir when searching for RTC
Narayan Kamath [Tue, 2 Feb 2016 09:36:55 +0000 (09:36 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC"
am:
21b2b7306e
* commit '
21b2b7306e7d0612cdcb90eaa8102b6a7fa3f130':
Alarm: add missing closedir after opendir when searching for RTC
Narayan Kamath [Tue, 2 Feb 2016 09:31:04 +0000 (09:31 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC"
Mykola Kondratenko [Mon, 18 Jan 2016 11:43:30 +0000 (12:43 +0100)]
Alarm: add missing closedir after opendir when searching for RTC
It is mandatory that closedir() is called to deallocate DIR structure
allocated by opendir().
Fix degrade introduced by Google commit
0eb58268.
Change-Id: Ia12154f7f822153b4fc8e6bfb8b2bae17bc45c1a
Jiabin Huang [Tue, 2 Feb 2016 09:22:02 +0000 (09:22 +0000)]
Merge "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode"
Jiabin Huang [Tue, 2 Feb 2016 08:09:05 +0000 (17:09 +0900)]
TIF: Improve android.media.tv.TvContract.Programs.Genres#decode
test results:
random string(1000 channels) decode 1000 times on Nexus Player
6.8 seconds => 1.4 seconds
Bug:
23307587
Change-Id: If309b0819d705d791c8fa9b177e6d2bd0019102e
Jaewan Kim [Tue, 2 Feb 2016 07:46:36 +0000 (07:46 +0000)]
Merge "PIP: Implement the initial version of onboarding screen"
Erik Kline [Tue, 2 Feb 2016 04:07:58 +0000 (04:07 +0000)]
Support static IP configuration internally
am:
1e91e4ebb6
* commit '
1e91e4ebb65e63969e6ae45503257852be017aee':
Support static IP configuration internally
Jaewan Kim [Wed, 20 Jan 2016 10:21:08 +0000 (19:21 +0900)]
PIP: Implement the initial version of onboarding screen
Redlines and assets will be applied later.
Bug:
26676479
Change-Id: I1a42fad0b918681c64ae84abb1bff8fac3289004
Casey Burkhardt [Tue, 2 Feb 2016 02:47:20 +0000 (02:47 +0000)]
Merge "Exposes accessibility importance on AccessibilityNodeInfo"
Sungsoo Lim [Tue, 2 Feb 2016 02:23:11 +0000 (02:23 +0000)]
Merge "MediaBrowserUtils: Fix NPE"
Sungsoo Lim [Tue, 2 Feb 2016 01:42:47 +0000 (10:42 +0900)]
MediaBrowserUtils: Fix NPE
Bug:
26910471
Change-Id: I134516f6318c34cc5dfdcf04438e6ba00b843607
Tim Murray [Tue, 2 Feb 2016 02:13:33 +0000 (02:13 +0000)]
Merge "Add specific category for TOP_APP in ActivityManager."
Hyungtae Kim [Tue, 2 Feb 2016 01:41:48 +0000 (01:41 +0000)]
Merge "Rename instr argument 'repeat' to 'iterations'"
Ryan Bavetta [Tue, 2 Feb 2016 00:53:56 +0000 (00:53 +0000)]
Merge "Allow Generic SoundTrigger Models"
Chong Zhang [Tue, 2 Feb 2016 00:35:41 +0000 (00:35 +0000)]
Merge "Do not draw background if the background drawable is null"
Sungsoo Lim [Tue, 2 Feb 2016 00:14:04 +0000 (00:14 +0000)]
Merge "MediaBrowser: Minor fixes"
Chong Zhang [Tue, 2 Feb 2016 00:08:21 +0000 (16:08 -0800)]
Do not draw background if the background drawable is null
Some apps may not have background drawables.
bug:
26729953
Change-Id: I1e93013bb91ba376449bc580646fc733ca4dd072
Hyungtae Tim Kim [Mon, 1 Feb 2016 23:39:55 +0000 (15:39 -0800)]
Rename instr argument 'repeat' to 'iterations'
The argument means the number of test iterations for camera
stress testing. Renamed for easier understanding of the argument.
Change-Id: I3247e35f8640c98db5c8438c3fc79a45073d9623
Wale Ogunwale [Mon, 1 Feb 2016 23:58:32 +0000 (23:58 +0000)]
Merge "Allow apps that target less than N SDK to be resizeable."
Fyodor Kupolov [Tue, 19 Jan 2016 18:07:54 +0000 (10:07 -0800)]
Self closing tags are not allowed as of Java 8
Self closing tags are not legal in HTML and javadoc was updated to better
enforce valid javadoc comments.
https://bugs.openjdk.java.net/browse/JDK-
8020619
Change-Id: Ia7644b79be559a2e88fc9850eab570bd926f9a4b
Geoff Mendal [Mon, 1 Feb 2016 23:51:31 +0000 (23:51 +0000)]
Import translations. DO NOT MERGE am:
73ecaf0881 -s ours am:
94d9f3c788 -s ours am:
5aec202998 -s ours am:
43d3ea4887 -s ours
am:
8793ae3ddc -s ours
* commit '
8793ae3ddccf8c82c5a6d7004e5563effa760183':
Import translations. DO NOT MERGE
Casey Burkhardt [Mon, 1 Feb 2016 23:44:43 +0000 (23:44 +0000)]
Merge "Update AccessibilityAction docs"
Philip P. Moltmann [Mon, 1 Feb 2016 23:42:05 +0000 (23:42 +0000)]
Merge "UI improvements for the print spooler"
Selim Gurun [Mon, 1 Feb 2016 23:40:23 +0000 (23:40 +0000)]
Merge "Run 32-bit app in multiArch APK."
Ben Kwa [Mon, 1 Feb 2016 23:40:16 +0000 (23:40 +0000)]
Merge "Fix a crash in Metrics code."
Philip P. Moltmann [Mon, 1 Feb 2016 23:37:29 +0000 (23:37 +0000)]
Merge "Update summary when printer changes"
Abhijith Shastry [Mon, 1 Feb 2016 23:36:15 +0000 (23:36 +0000)]
Merge "BlockedNumberContract API changes:"
Geoff Mendal [Mon, 1 Feb 2016 23:35:52 +0000 (23:35 +0000)]
Import translations. DO NOT MERGE am:
73ecaf0881 -s ours am:
94d9f3c788 -s ours am:
5aec202998 -s ours
am:
43d3ea4887 -s ours
* commit '
43d3ea488729e22995df09be756217a87d7fa39b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 23:30:56 +0000 (23:30 +0000)]
Import translations. DO NOT MERGE am:
73ecaf0881 -s ours am:
94d9f3c788 -s ours
am:
5aec202998 -s ours
* commit '
5aec202998dfc1f72159b25892358c9f477d35f5':
Import translations. DO NOT MERGE
Chong Zhang [Mon, 1 Feb 2016 23:27:36 +0000 (23:27 +0000)]
Merge "Fix FLAG_ACTIVITY_CLEAR_TOP not working for aliased activities"
Geoff Mendal [Mon, 1 Feb 2016 23:26:05 +0000 (23:26 +0000)]
Import translations. DO NOT MERGE am:
73ecaf0881 -s ours
am:
94d9f3c788 -s ours
* commit '
94d9f3c78856217a1d7c6444fb7f9bc47ce96adc':
Import translations. DO NOT MERGE
Makoto Onuki [Mon, 1 Feb 2016 23:24:20 +0000 (23:24 +0000)]
Merge "Fix DPM unit tests"
Makoto Onuki [Thu, 28 Jan 2016 22:44:18 +0000 (14:44 -0800)]
Fix DPM unit tests
Bug
26911599
Change-Id: I874c9cd4f63c79bc984777ef3b1b654a414c4911
Geoff Mendal [Mon, 1 Feb 2016 23:21:45 +0000 (23:21 +0000)]
Import translations. DO NOT MERGE
am:
73ecaf0881 -s ours
* commit '
73ecaf0881121522831c33563c5dcdcfda11f895':
Import translations. DO NOT MERGE
Arunesh Mishra [Mon, 1 Feb 2016 23:15:25 +0000 (23:15 +0000)]
Merge "Fix moduleProperties in SoundTriggerInternal."
Rob Carr [Mon, 1 Feb 2016 23:12:14 +0000 (23:12 +0000)]
Merge "Ensure Surface matrix set even when size unchanged."
Rob Carr [Mon, 1 Feb 2016 23:11:51 +0000 (23:11 +0000)]
Merge "Allow saving child surfaces."
Robert Carr [Mon, 1 Feb 2016 20:31:01 +0000 (12:31 -0800)]
Allow saving child surfaces.
We can and should save child surfaces as the client side window
state hasn't been torn down in the case where we would otherwise save.
So, if we destroy the Surface, the client will continue to render
and crash.
Bug:
26793431
Bug:
25780116
Bug:
26777815
Change-Id: Ia043b7af24b9370fc17a5b57226566f94c08ba4e
Abhijith Shastry [Thu, 28 Jan 2016 21:27:08 +0000 (13:27 -0800)]
BlockedNumberContract API changes:
1. Add a method isProviderSupportedForCurrentUser for multi-user scenarios.
2. Remove STRIPPED_NUMBER column.
BUG:
26232372
Change-Id: Ida703d7a873915a02cd7918ed297cf039a7956c9
Steve McKay [Mon, 1 Feb 2016 23:00:59 +0000 (23:00 +0000)]
Merge "Create "Home" dir instead of "home" to match other default dirs."
Roozbeh Pournader [Mon, 1 Feb 2016 22:57:58 +0000 (22:57 +0000)]
Merge "Make default resources a better match for en-US requests"
Deepanshu Gupta [Mon, 1 Feb 2016 22:57:10 +0000 (22:57 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Roozbeh Pournader [Mon, 1 Feb 2016 21:49:52 +0000 (13:49 -0800)]
Make default resources a better match for en-US requests
When locale fallback landed, resources which specified an 'English'
locale started to be considered a better match for en-US, even though
traditionally, apps tend to ship US English resources under their
default locale.
This fixes that, and makes en-US requests match default locales.
Bug:
26756573
Bug:
26789680
Bug:
26803868
Change-Id: I460c276bfc6ddba0439dcdf87497a0aece0fa05d
Deepanshu Gupta [Mon, 1 Feb 2016 22:56:43 +0000 (22:56 +0000)]
Remove obsolete try catch am:
ebdcc80ac2
am:
29e8071d2e
* commit '
29e8071d2e9f3a8171624fd63b849f5c14360b21':
Remove obsolete try catch
Tao Bai [Tue, 12 Jan 2016 23:02:24 +0000 (15:02 -0800)]
Run 32-bit app in multiArch APK.
Bug:
26874366
Change-Id: I2c1fd1d036efe72b28b5fe996416df69a583959f
Xiaohui Chen [Mon, 1 Feb 2016 20:19:35 +0000 (12:19 -0800)]
sysui: small refactor
Bug:
26161831
Change-Id: I020176d49cb12c7f7b56ad6eb1221e678312f798
Deepanshu Gupta [Mon, 1 Feb 2016 22:52:50 +0000 (22:52 +0000)]
Remove obsolete try catch
am:
ebdcc80ac2
* commit '
ebdcc80ac26ae51ba27d9469a501a6242256aa50':
Remove obsolete try catch
Philip P. Moltmann [Mon, 1 Feb 2016 22:49:51 +0000 (22:49 +0000)]
Merge "Init and clean up printer registry independat of state."
Steve McKay [Sat, 30 Jan 2016 00:13:21 +0000 (16:13 -0800)]
Create "Home" dir instead of "home" to match other default dirs.
Add DIRECTORY_HOME to android.os.Environment...use that for dir name,
so we don't use a localized name when creating directory.
Mark all of the DIRECTORY_* fields final.
Bug:
26814341
Change-Id: I5a11bcb180674c619de2f5ce9ed598521e60cc25
Rubin Xu [Mon, 1 Feb 2016 22:46:02 +0000 (22:46 +0000)]
Merge "Mask widgets for suspended packages."
Ryan Bavetta [Wed, 27 Jan 2016 04:49:28 +0000 (20:49 -0800)]
Allow Generic SoundTrigger Models
BUG:
22860713
Change-Id: Ic260af0831f9751ced161820f52f0b0185bdfcea
Chong Zhang [Mon, 1 Feb 2016 22:33:53 +0000 (14:33 -0800)]
Fix FLAG_ACTIVITY_CLEAR_TOP not working for aliased activities
bug:
26216591
Change-Id: I26528b7613bd8aa80fc7f4d6b64ea7bf639935d3
Bart Sears [Mon, 1 Feb 2016 22:30:21 +0000 (22:30 +0000)]
Merge "Hack to get devices booting again." into mnc-dr1.5-dev am:
29700949ad am:
795e53a36b
am:
6d9b0fb923
* commit '
6d9b0fb923bc6d77b23ac40841625d61eb003e0f':
Hack to get devices booting again.
Bart Sears [Mon, 1 Feb 2016 22:27:37 +0000 (22:27 +0000)]
Merge "Hack to get devices booting again." into mnc-dr1.5-dev am:
29700949ad
am:
795e53a36b
* commit '
795e53a36b0bda3555e23ea8b54cf97361014a24':
Hack to get devices booting again.
Jorim Jaggi [Mon, 1 Feb 2016 22:24:05 +0000 (14:24 -0800)]
Fix build
Change-Id: Ifed64dc2a4db9a58c3588ea0ca899f628efe685a
Bart Sears [Mon, 1 Feb 2016 22:23:34 +0000 (22:23 +0000)]
Merge "Hack to get devices booting again." into mnc-dr1.5-dev
am:
29700949ad
* commit '
29700949ad981bde8d35219914161f6424e7757b':
Hack to get devices booting again.
Jorim Jaggi [Mon, 1 Feb 2016 22:18:21 +0000 (22:18 +0000)]
Merge changes Ie6c1ea33,Id1af37e6,I9c474f7a,I439c9b66
* changes:
Reset create state in moveTaskToStack
Divider tuning
Fix transition to recents in docked mode
Fix flicker and other weirdness
Bart Sears [Mon, 1 Feb 2016 22:17:49 +0000 (22:17 +0000)]
Merge "Hack to get devices booting again." into mnc-dr1.5-dev
Antonio Cansado [Mon, 1 Feb 2016 22:16:44 +0000 (22:16 +0000)]
Merge "Retuning tag information through NetworkStatsManager."
Arunesh Mishra [Mon, 1 Feb 2016 22:06:37 +0000 (14:06 -0800)]
Fix moduleProperties in SoundTriggerInternal.
Change-Id: Ie7ea74ca39894f78875768dbc3e504b32f262fe6
Antonio Cansado [Thu, 10 Dec 2015 23:57:56 +0000 (15:57 -0800)]
Retuning tag information through NetworkStatsManager.
Network tags could be set since ICS but was not exposed
through the SDK. This CL extends existing functionality
of NetworkStatsManager to return network tags.
Bug:
25813338
Change-Id: I414b98193249ba88a3f2d64cb2e0d2633f64fa3f
Steven Dao [Mon, 1 Feb 2016 22:10:52 +0000 (22:10 +0000)]
Merge "Fix CollectionItemInfo.isHeading for ListView"
Rubin Xu [Mon, 25 Jan 2016 16:13:50 +0000 (16:13 +0000)]
Mask widgets for suspended packages.
Bug:
22776761
Change-Id: I271257e765a2297c780ac2bd37426d8fb451e5d9
Philip P. Moltmann [Mon, 1 Feb 2016 22:03:36 +0000 (22:03 +0000)]
Merge "Only update UI when bound"
Deepanshu Gupta [Mon, 1 Feb 2016 22:03:30 +0000 (14:03 -0800)]
Remove obsolete try catch
The try catch was to prevent crashing on preview releases of Android
Studio. We don't support them anymore.
Change-Id: I8e33cae98117c0034aea1b56903b623fcb64435e
Xiaohui Chen [Mon, 1 Feb 2016 22:03:27 +0000 (22:03 +0000)]
Merge "Make user deletion dialog reusable."
Philip P. Moltmann [Mon, 1 Feb 2016 21:56:45 +0000 (13:56 -0800)]
Init and clean up printer registry independat of state.
The printer registry is created not in sync with the states or the
activity life-cycle. It might not be initialized when stop is called as
we might have a very quick
create -> start -> stop -> finish
without time for the print subsystem to initialize.
Bug:
21749058
Change-Id: I991029a7fd0ad162c1144ff03438707f16bf0b02
Hyunyoung Song [Mon, 1 Feb 2016 21:52:42 +0000 (21:52 +0000)]
Merge "Runtime exception on AppWidgetHostView should not cause crash to the hosting process."
Hyunyoung Song [Mon, 1 Feb 2016 21:51:39 +0000 (13:51 -0800)]
Runtime exception on AppWidgetHostView should not cause crash to the hosting process.
b/
26797293
Change-Id: I7e1efad7d5314141d21440bf8915c101e35c2adf
Jorim Jaggi [Sat, 30 Jan 2016 02:25:30 +0000 (18:25 -0800)]
Reset create state in moveTaskToStack
One could call moveTaskToStack with DOCKED_STACK as argument. In that
case, we also need to set the create state so it resets it to
something sane.
Change-Id: Ie6c1ea33e4ec3c4cd2a935dc186d2b496289946f
Jorim Jaggi [Sat, 30 Jan 2016 00:49:55 +0000 (16:49 -0800)]
Divider tuning
- Take insets into account for calculating dismissing fraction,
but don't dim into 100% when the device has insets at that
side.
- When applying parallax to the top side, apply less.
Change-Id: Id1af37e6f7af43ec3682dad4ad1ce68034301b4d
Oleksandr Peletskyi [Mon, 1 Feb 2016 21:30:43 +0000 (21:30 +0000)]
Merge "Added restriction that disallows ability to set wallpaper. BUG:
24890474"
Michael Lentine [Mon, 1 Feb 2016 21:28:25 +0000 (21:28 +0000)]
Merge "Adding plumbing for passing the lib directory."
Geoff Mendal [Mon, 1 Feb 2016 21:24:23 +0000 (13:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I25920d1a09b527c9e2868537f68d994a40a85e6a
Auto-generated-cl: translation import
Fyodor Kupolov [Mon, 1 Feb 2016 21:21:46 +0000 (21:21 +0000)]
Merge "Synchronously finish boot when user starts in background"
Geoff Mendal [Mon, 1 Feb 2016 21:20:11 +0000 (21:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
60e392e021 -s ours
am:
8cc5899aef -s ours
* commit '
8cc5899aef3ab8e1ad35d6882a082416aea734ed':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 21:14:42 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
60e392e021 -s ours
* commit '
60e392e021da2fe8b05986c545b324a4e70f396e':
Import translations. DO NOT MERGE
Sanket Agarwal [Wed, 27 Jan 2016 04:12:52 +0000 (20:12 -0800)]
Add Headset HF role to the settings menu
- Makes the HF client a configurable item in Settings. You can
enable/disable HF per item.
- Disconnect works cleanly since Settings now disconnects HF and hence
tear down the ACL.
Bug: b/
26808830
Change-Id: I062b64beac4c009a6075756b7f163c6455d77af2
Geoff Mendal [Mon, 1 Feb 2016 21:10:47 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Robert Carr [Mon, 1 Feb 2016 21:08:15 +0000 (13:08 -0800)]
Ensure Surface matrix set even when size unchanged.
Simple error preventing transform matrices from being
updated when the size isn't changed.
Bug:
26454664
Bug:
25287371
Change-Id: I0e1a71ceda725e26d49786593665cf0865213c91
Geoff Mendal [Mon, 1 Feb 2016 21:08:15 +0000 (13:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I22adb9c9dea51a632471abe8623deea91ba90b25
Auto-generated-cl: translation import
Philip P. Moltmann [Mon, 1 Feb 2016 20:03:48 +0000 (12:03 -0800)]
Only update UI when bound
If the PrintActivity gets destroyed (e.g. due to low memory) it gets
re-created when the PrintToPDF activity returns in onActivityResult. In
this case onActivityResult is called right after onCreate and before the
UI is bound. This resulted in a NullPointerException when accessing the
unbound UI elements.
Bug:
21749058
Change-Id: I44e625e8c4f10432591d0afcf7825d7e0dbee6f5
Geoff Mendal [Mon, 1 Feb 2016 21:02:43 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Victor Chang [Mon, 1 Feb 2016 21:01:13 +0000 (21:01 +0000)]
Fix that can't launch managed QuickContact in ContactSearch
It happens when caller id is disabled but contacts search is enabled
BUG=
26740020
Change-Id: I4ca79c82ed27f6f1da514b31d8d89fc71fd243fb
Geoff Mendal [Mon, 1 Feb 2016 21:00:10 +0000 (13:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: I33ec1d301ea490620093cf078e4bf3e9d8f81d7e
Auto-generated-cl: translation import
Julia Reynolds [Mon, 1 Feb 2016 20:59:06 +0000 (20:59 +0000)]
Merge "Send ranking update on importance change."
Geoff Mendal [Mon, 1 Feb 2016 20:52:55 +0000 (20:52 +0000)]
Import translations. DO NOT MERGE am:
f544fc21d0 -s ours am:
b2628caab6 -s ours am:
21a6f2050a -s ours
am:
80a4c66e61 -s ours
* commit '
80a4c66e61348bc22d6c0eef467ead55fc95c6c3':
Import translations. DO NOT MERGE