OSDN Git Service
Philip P. Moltmann [Tue, 8 Aug 2017 17:49:38 +0000 (10:49 -0700)]
Revert session-transfer change
This reverts:
5d74493f64493cd506d7458b810095259287f623
94deaf7725c418ec1950d810ab86f0d157ddf518
Bug:
64467704
Test: none, 100% revert
Change-Id: I6534c19c594dadfa41457725988485a67f0ed45f
(cherry picked from commit
9890f8b426550485aaab164a7bedbcd545862b85)
android-build-team Robot [Tue, 8 Aug 2017 07:27:52 +0000 (07:27 +0000)]
release-request-
c8b8af6b-4899-402a-9ff7-
72255ba5300b-for-git_oc-mr1-release-
4253898 snap-temp-L09600000090287887
Change-Id: Iee3b7ba3cab3ce9f338311b5886d3fb09db3e186
TreeHugger Robot [Tue, 8 Aug 2017 06:18:56 +0000 (06:18 +0000)]
Merge "Start ARC action when setSystemAudioMode" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 06:03:18 +0000 (06:03 +0000)]
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 01:15:41 +0000 (01:15 +0000)]
Merge "thermalservice: Add ThermalService java interfaces" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:45:48 +0000 (00:45 +0000)]
Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev
* changes:
Allow to read all params used to create session.
Allow to transfer+seal a install session
Matthew Ng [Tue, 8 Aug 2017 00:39:26 +0000 (00:39 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
am:
673e3c41ec
Change-Id: Iedcf8f27eacdba8ad96a4753fb108f4539930fb9
Matthew Ng [Tue, 8 Aug 2017 00:38:32 +0000 (00:38 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
am:
c7d24aed82
Change-Id: I96ed9a5f7f295b1a3f3a9199547945e4958a34a3
Tomasz Wasilczyk [Tue, 8 Aug 2017 00:35:09 +0000 (00:35 +0000)]
Merge "Change VENDOR program types to range." into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:32:09 +0000 (00:32 +0000)]
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
Calin Juravle [Tue, 8 Aug 2017 00:17:44 +0000 (00:17 +0000)]
Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 23:35:56 +0000 (23:35 +0000)]
Merge "Minor Autofill changes after API council review." into oc-mr1-dev
Sudheer Shanka [Mon, 7 Aug 2017 23:32:50 +0000 (23:32 +0000)]
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 23:28:50 +0000 (23:28 +0000)]
Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev
Adam Bookatz [Mon, 7 Aug 2017 23:22:31 +0000 (23:22 +0000)]
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev
Todd Poynor [Fri, 26 May 2017 00:53:21 +0000 (17:53 -0700)]
thermalservice: Add ThermalService java interfaces
Binder service ThermalService broadcasts thermal events to registered
listeners.
Test: manual: marlin with modified thermal-engine.conf and temporary
java thermal event listener
Bug:
30982366
Change-Id: I11f7fd18feff3b9af0eecc3fd3a13d54c0b97ff0
(cherry picked from commit
dd05582eabb6809899e3187d3afc1e97e148fdb1)
Yohei Yukawa [Mon, 7 Aug 2017 22:34:51 +0000 (22:34 +0000)]
Merge "Bind SpellCheckerService as IMPORTANT_BACKGROUND" into oc-mr1-dev
Andrii Kulian [Mon, 7 Aug 2017 22:21:08 +0000 (22:21 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
am:
cbdaf04101
Change-Id: I9ce5cf5aea7f0fd93fbe24664bbd583d5057d3e6
TreeHugger Robot [Mon, 7 Aug 2017 22:18:11 +0000 (22:18 +0000)]
Merge "AAPT2: Add targetConfig to AndroidManifest.xml" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 22:17:50 +0000 (22:17 +0000)]
Merge "AAPT2: Ensure style strings are always first in StringPool" into oc-mr1-dev
Andrii Kulian [Mon, 7 Aug 2017 22:07:22 +0000 (22:07 +0000)]
Merge "Add black frame behind app window" into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 21:20:54 +0000 (21:20 +0000)]
Merge "media: Address api council comments." into oc-mr1-dev
Zheng Zhang [Mon, 7 Aug 2017 20:51:23 +0000 (13:51 -0700)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
Bug:
64424030
Change-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb
TreeHugger Robot [Mon, 7 Aug 2017 21:10:49 +0000 (21:10 +0000)]
Merge "Only replace new line characters if the wakelock name contains one The original operation creates new string everytime which is expensive" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 21:05:42 +0000 (21:05 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 20:12:05 +0000 (20:12 +0000)]
Merge "Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"" into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 20:06:20 +0000 (20:06 +0000)]
Revert "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT"
This reverts commit
84933321668c79202de39ea491329f7234ce6ee5.
Change-Id: Ibecf24689952d4888269863ff02d8c97e14a0c31
Adrian Roos [Mon, 7 Aug 2017 18:41:04 +0000 (18:41 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
am:
2b7fbd010e
Change-Id: I2956ecaff7b471af05e9baa275d7ea0742bfb4eb
TreeHugger Robot [Mon, 7 Aug 2017 18:27:57 +0000 (18:27 +0000)]
Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
Matthew Ng [Wed, 2 Aug 2017 21:00:59 +0000 (14:00 -0700)]
Reset wait for transition state to false when recents goes invisible
From ag/
2572257, this change will ensure the transition wait flag to be
false when recents runs "onStop" or when it becomes invisible. This
should fix edge cases when a user goes from Recents to somewhere that
is not a fullscreen app (like home). Resetting the state should allow
users to use the recents button without getting blocked.
There is only two locations where the flag is set to true, when user
starts recents and when an app is started from recents. When a user goes
from recents to home with the recents button (when the phone gets into a
wierd state), then the flag is true but home does not reset the flag
because the old change expects a non-home app to start. Now whenever
recents is dismissed, the flag will be reset.
Fixes:
37277853
Bug:
64098508
Test: start recents with apps in it, go to guest account, start apps in
recents, go back to main account, unlock keyguard, press recents button
to dismiss recents (do not press home or back), it will go to home,
press recents again
Change-Id: I07c292d701a621685c836a4f6040864377f0a3dd
TreeHugger Robot [Mon, 7 Aug 2017 18:19:59 +0000 (18:19 +0000)]
Merge "PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
Philip P. Moltmann [Thu, 3 Aug 2017 21:35:56 +0000 (14:35 -0700)]
Allow to read all params used to create session.
So that they can be verified by the app calling commit().
This really only makes sense if the app calling commit is different from
the app that created the session.
Bug:
37281396
Test: cts-tradefed run cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionTransferTest
Installed and uninstalled packages via the PackageInstaller app
Change-Id: I5c954ca59b7582555bea847f3ddbba0aeefba301
Philip P. Moltmann [Wed, 19 Jul 2017 17:06:14 +0000 (10:06 -0700)]
Allow to transfer+seal a install session
... so that one package can supply the data and another one can issue
the commit.
Also allow reading of sealed sessions.
Also lock more in PackageInstallerSession so that we can be sure the
session is not used by the old package anymore once transferred and that
all calls into the session work on consistent data.
Bug:
37281396
Test: cts-tradefed run cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionTransferTest
Installed and uninstalled packages via the PackageInstaller app
Installed and uninstalled packages via the Google Play Store
Change-Id: Id4b7a0071d703b7d18c9f5bf2bd15ebf67086d07
Adam Lesinski [Mon, 7 Aug 2017 17:43:08 +0000 (17:43 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
am:
242c22c900
Change-Id: I8be36dcf67b6d32f69fbefdf2bd78e04034f6bb8
TreeHugger Robot [Mon, 7 Aug 2017 17:34:44 +0000 (17:34 +0000)]
Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
Tomasz Wasilczyk [Fri, 4 Aug 2017 19:56:47 +0000 (12:56 -0700)]
Change VENDOR program types to range.
Bug: b/
64331420
Test: instrumentation
Change-Id: If5c56f09e2b9e272a40f0ca074a590ca6ec3a703
Ecco Park [Mon, 7 Aug 2017 17:18:55 +0000 (17:18 +0000)]
Location: adding NULL check for the LPP_PROFILE property
am:
8eec744ccb
Change-Id: Ia72f80b5d809190c7e2f733c8e59bf989f826973
Ecco Park [Fri, 4 Aug 2017 23:21:59 +0000 (16:21 -0700)]
Location: adding NULL check for the LPP_PROFILE property
Bug:
35485906
Change-Id: I5e40be8ce0d3832f0e913bfe8fd9a38d87d0d28c
Signed-off-by: Ecco Park <eccopark@google.com>
Jonathan Basseri [Mon, 7 Aug 2017 16:24:31 +0000 (16:24 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
am:
35a563ef62
Change-Id: Ib898af17ce2985a1e19759dd9296f3cea8077018
Jonathan Basseri [Mon, 7 Aug 2017 16:18:52 +0000 (16:18 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 16:18:37 +0000 (16:18 +0000)]
Merge "Allow marking fields with @TargetApi(XX)" into oc-mr1-dev
Adrian Roos [Mon, 7 Aug 2017 13:52:26 +0000 (15:52 +0200)]
AOD: Fix shelf animating when it should not
Fixes an issue where the shelf would animate downwards when going to AOD.
The issue is that setDark gets called in updateIsKeyguard even though nothing changed,
yet it still re-requests the dark transition. Consequently, when the keyguard goes dark
later, the requested transition executes and moves the shelf downwards.
Change-Id: I8c590aeb4f330d8c3c1b51285d899d5f6db36323
Fixes:
64412244
Test: Double tap on notification on AOD2; press power; verify shelf does not move downwards
Adrian Roos [Mon, 7 Aug 2017 13:48:46 +0000 (13:48 +0000)]
Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev
am:
9f3bac52ee
Change-Id: I8c17429ce2b79a3e14e7b6cbabf7b377ace44718
TreeHugger Robot [Mon, 7 Aug 2017 13:41:22 +0000 (13:41 +0000)]
Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev
Adrian Roos [Mon, 7 Aug 2017 13:02:21 +0000 (13:02 +0000)]
Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
am:
81e3b48f9c
Change-Id: I6f0ae86412eb174474d640c437e0b0b006507c00
TreeHugger Robot [Mon, 7 Aug 2017 12:53:50 +0000 (12:53 +0000)]
Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
Jorim Jaggi [Mon, 7 Aug 2017 12:34:41 +0000 (12:34 +0000)]
Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
am:
9aa43e6320
Change-Id: I0889a00cbdc54d401484391d66e0dd06ac92fd71
Jorim Jaggi [Mon, 7 Aug 2017 12:27:53 +0000 (12:27 +0000)]
Merge "Fix light bar flickers" into oc-dr1-dev
am:
997f2f71fa
Change-Id: I8b5fb57655afe1b9cab6afe3f5f34d48413af062
Jorim Jaggi [Mon, 7 Aug 2017 12:23:55 +0000 (12:23 +0000)]
Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
Jorim Jaggi [Mon, 7 Aug 2017 12:17:35 +0000 (12:17 +0000)]
Merge "Fix light bar flickers" into oc-dr1-dev
Martijn Coenen [Mon, 7 Aug 2017 11:01:14 +0000 (11:01 +0000)]
Merge "screencap: always exit with _exit()." into oc-dr1-dev
am:
4499576db0 -s ours
Change-Id: I6119b3e45a4b104aa9a7cbad576a6b3d8a273ca4
TreeHugger Robot [Mon, 7 Aug 2017 10:54:02 +0000 (10:54 +0000)]
Merge "screencap: always exit with _exit()." into oc-dr1-dev
Robert Carr [Mon, 7 Aug 2017 10:49:05 +0000 (10:49 +0000)]
Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev
am:
17844f2257
Change-Id: Ic1d7779f66958961da22230187f71310d9fedec8
TreeHugger Robot [Mon, 7 Aug 2017 10:44:18 +0000 (10:44 +0000)]
Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev
android-build-team Robot [Mon, 7 Aug 2017 07:28:00 +0000 (07:28 +0000)]
release-request-
ddf09bbc-6509-421f-8fa6-
f8ae07cdafea-for-git_oc-mr1-release-
4250733 snap-temp-L31300000089845305
Change-Id: Ia2ae2dfb112a4d4cc07dee29ce81a8f29e5904a8
TreeHugger Robot [Mon, 7 Aug 2017 06:01:02 +0000 (06:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Hugo Benichi [Mon, 7 Aug 2017 05:49:25 +0000 (05:49 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
am:
1b3877a965
Change-Id: I50748aa0c9332787797f91265afccf82ceabf332
Hugo Benichi [Mon, 7 Aug 2017 05:42:48 +0000 (05:42 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
Sungsoo Lim [Mon, 7 Aug 2017 01:40:01 +0000 (10:40 +0900)]
Start ARC action when setSystemAudioMode
Bug:
32862965
Test: manual
Change-Id: I6cf30c48649572fa045b734a5c01cf2dc219adc3
Pankaj Kanwar [Sun, 6 Aug 2017 18:58:41 +0000 (18:58 +0000)]
Merge "Adding strings to support warning about emergency calls." into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 17:26:43 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:36:37 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:34:54 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:28:58 +0000 (16:28 +0000)]
Merge "Fix broken javadocs." into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:23:59 +0000 (16:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:22:25 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:20:54 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:19:51 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:19:05 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:15:03 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:13:56 +0000 (16:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 16:05:04 +0000 (16:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 15:57:07 +0000 (15:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 6 Aug 2017 14:52:48 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jeff Sharkey [Sat, 5 Aug 2017 19:49:13 +0000 (13:49 -0600)]
Fix broken javadocs.
Bug:
64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6
Bill Yi [Sun, 6 Aug 2017 10:16:09 +0000 (03:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia0c7b2cac613780c802ac645226d33ad031d768a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 10:09:38 +0000 (03:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I10155c355d302c88ef1e99d7dc64da171be90840
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:47:13 +0000 (01:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e617e1a004e45b485658d496e09cd4c732415cc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:40:32 +0000 (01:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia3d470f1ae6cc63bb3cc9d58b896eaf57075e0a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:35:38 +0000 (01:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea4f3f8198348c4ac06675dc9881d13d09528b39
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:30:50 +0000 (01:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I962af978bb234c98434ec32b7cca97bdedb2e7f4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:26:03 +0000 (01:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic952913a31c1683c0a6ea7c14763721c529ce26d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:21:24 +0000 (01:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib2668121a28d316552691d7f72da05a5a3c78321
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:14:54 +0000 (01:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iec1e8c2c5c13484ffc915fcaa874d5cc43c1a66c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:09:59 +0000 (01:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ed3fe6e64b2ac5bec9e451e9e1797e6bea8031b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:05:08 +0000 (01:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: If79c2f71715afe6a11a91a8e3e94fb9184f3a21f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 08:00:22 +0000 (01:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab686e68cda9fac3b18a8fb38fe766d9583ebf68
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 07:54:17 +0000 (00:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie00477d775338c307f23550d2bdc99f0933246e8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
android-build-team Robot [Sun, 6 Aug 2017 07:27:47 +0000 (07:27 +0000)]
release-request-
d642586e-3e25-49f4-8b4c-
acad0e3f63d8-for-git_oc-mr1-release-
4249777 snap-temp-L81500000089724408
Change-Id: Ia22f67a54093feb58911d2f09d946f12814162fe
Bill Yi [Sun, 6 Aug 2017 01:43:53 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie34e4b0e1787d5772c175be2c0de14a6de527003
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 01:33:48 +0000 (18:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib2fd9bee8040fa4c57a62cbf22a64361201ab7cd
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Chen Xu [Sat, 5 Aug 2017 22:54:29 +0000 (22:54 +0000)]
Merge "rename notification channel" into oc-mr1-dev
Tomasz Wasilczyk [Sat, 5 Aug 2017 20:47:14 +0000 (20:47 +0000)]
Merge "Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1." into oc-mr1-dev
Bill Yi [Sat, 5 Aug 2017 13:42:53 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
f6d5426433 -s ours
Change-Id: Ie9c97e96908f2552ec64910eac8dd3d8aff45500
Bill Yi [Sat, 5 Aug 2017 13:40:53 +0000 (13:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
5e4a4d76e1 -s ours
Change-Id: I6b5cbb464105136e6cdaacd6a971232dfb837edd
Bill Yi [Sat, 5 Aug 2017 13:38:52 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
08815ac99f -s ours
Change-Id: I18be08851853ec4eefd1f209d9452f4412ed6584
Bill Yi [Sat, 5 Aug 2017 13:36:11 +0000 (13:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
f9e03da0b9 -s ours
Change-Id: Ibfc11d3ad1c6a5892ada761cab957f65467e511c
TreeHugger Robot [Sat, 5 Aug 2017 13:31:00 +0000 (13:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 5 Aug 2017 13:29:59 +0000 (13:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
OSDN Git Service
