OSDN Git Service
Lucas Dupin [Wed, 28 Jun 2017 18:42:00 +0000 (18:42 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
am:
b02863eba6
Change-Id: I81906c7fc634135f979316dd3c5d8d825bcf6c32
Lucas Dupin [Wed, 28 Jun 2017 18:34:28 +0000 (18:34 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
* changes:
Support dark text on Recents
Replaced overlay target package
Mady Mellor [Wed, 28 Jun 2017 18:20:21 +0000 (18:20 +0000)]
If the menu hasn't been created yet don't do things with it am:
104be2e019
am:
ded383d8b3
Change-Id: Id4ca0a39f39855133b384f87bb535dd1f01f5a93
Android Build Merger (Role) [Wed, 28 Jun 2017 18:17:38 +0000 (18:17 +0000)]
Merge "If the menu hasn't been created yet don't do things with it am:
104be2e019 am:
ef9a16202d" into oc-dr1-dev-plus-aosp
Mady Mellor [Wed, 28 Jun 2017 18:16:02 +0000 (18:16 +0000)]
If the menu hasn't been created yet don't do things with it am:
104be2e019
am:
ef9a16202d
Change-Id: I3f8bbe102215bf3c15f9cfa1556a2a51fc66449c
Jason Monk [Wed, 28 Jun 2017 18:15:27 +0000 (18:15 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev
am:
082a4e254f
Change-Id: I82666e8068b7c660052004f438333bfd0ec3150a
Jason Monk [Wed, 28 Jun 2017 18:13:35 +0000 (18:13 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
am:
3ad6233685
Change-Id: I3d90b93e7dd896157dc1f645f3d8327bb0afd59a
Mady Mellor [Wed, 28 Jun 2017 18:10:07 +0000 (18:10 +0000)]
If the menu hasn't been created yet don't do things with it
am:
104be2e019
Change-Id: I6bf4197736f6a6c6760ac091a2ca71402e44dec8
Mady Mellor [Wed, 28 Jun 2017 18:08:52 +0000 (18:08 +0000)]
If the menu hasn't been created yet don't do things with it
am:
104be2e019
Change-Id: I670206eb1da007b1eeea5f022124a352b0644b6a
Lei Yu [Wed, 28 Jun 2017 18:05:18 +0000 (18:05 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
am:
a023184bbc
Change-Id: Ibd5d41feaf18aacad79345404c944f365aa19587
Jason Monk [Wed, 28 Jun 2017 18:03:24 +0000 (18:03 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
Lei Yu [Wed, 28 Jun 2017 17:55:04 +0000 (17:55 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
Jeff Davidson [Wed, 28 Jun 2017 17:33:01 +0000 (17:33 +0000)]
Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
am:
f28843dd3f
Change-Id: Ibd7c9c673c9272696cd955ddc50d4b55755d5429
Neil Fuller [Wed, 28 Jun 2017 17:28:11 +0000 (17:28 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage" am:
4e77ae6d1a am:
4a7e3de5e7
am:
c1bf6505c8
Change-Id: I3342b515252fd5169a59b5b7d93d1d109036445c
Jeff Davidson [Wed, 28 Jun 2017 17:23:49 +0000 (17:23 +0000)]
Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
Neil Fuller [Wed, 28 Jun 2017 17:20:30 +0000 (17:20 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage" am:
4e77ae6d1a
am:
4a7e3de5e7
Change-Id: I5db1d32b6141653e7971c4f1dd9931d4042bb19b
Neil Fuller [Wed, 28 Jun 2017 17:13:35 +0000 (17:13 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage"
am:
4e77ae6d1a
Change-Id: Ib30177ef93ecacfbd6ab0fb98f933fbf8af0e270
Neil Fuller [Wed, 28 Jun 2017 17:01:56 +0000 (17:01 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage"
Ying Xu [Wed, 28 Jun 2017 16:54:19 +0000 (16:54 +0000)]
Merge "Use Bundle for inter-process message" into oc-dr1-dev
am:
e5ad3821e3
Change-Id: Ia847e54c387fc145b36313048860aa6b281d4c56
Ying Xu [Wed, 28 Jun 2017 16:47:50 +0000 (16:47 +0000)]
Merge "Use Bundle for inter-process message" into oc-dr1-dev
Mady Mellor [Wed, 21 Jun 2017 00:18:53 +0000 (17:18 -0700)]
If the menu hasn't been created yet don't do things with it
Test: runtest systemui
Fixes:
62594598
Change-Id: I1050e2b2bf1ece960d19ad13cb6a9bf71512db57
(cherry picked from commit
0b3f004acbb0eef38ee5e8d920e934f7ab2f7cde)
Shunta Sato [Fri, 14 Apr 2017 07:01:54 +0000 (16:01 +0900)]
Enable "Reboot to safe mode" confirmation on GlobalActions
Android N or prior GlobalActions showed "Reboot to safe mode",
when user do long-press of "power off" button on GlobalActions.
Currently, no confirmation dialog is shown. It's not user friendly.
This commit make it enable again.
- Also dismiss global actions on long press.
Test: manual
Bug:
37333890
Change-Id: I3bfefff3cd34ba35b003281e94a4181cebb74fcf
Adrian Roos [Wed, 28 Jun 2017 15:31:56 +0000 (15:31 +0000)]
Merge "AOD: Proximity check doze triggers" into oc-dr1-dev
am:
939171ee8b
Change-Id: Id9694514f9f48f659d7df56f05c5e4492a30de2b
Android Build Merger (Role) [Wed, 28 Jun 2017 15:29:37 +0000 (15:29 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
f36a995424 -s ours am:
8a6ee58aa0 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Wed, 28 Jun 2017 15:28:49 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f36a995424 -s ours
am:
8a6ee58aa0 -s ours
Change-Id: Ib7fab968af53d8cc0986ee18f1e0a7cd6c27dde2
Bill Yi [Wed, 28 Jun 2017 15:28:14 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f36a995424 -s ours
am:
270ef883af -s ours
Change-Id: I8b5f947a09796fdc59cc170b894ba48c844faef3
TreeHugger Robot [Wed, 28 Jun 2017 15:27:02 +0000 (15:27 +0000)]
Merge "AOD: Proximity check doze triggers" into oc-dr1-dev
Bill Yi [Wed, 28 Jun 2017 15:21:46 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f36a995424 -s ours
Change-Id: Icf392e8e462ed9bb42b9b8b67850ab702078e559
Bill Yi [Wed, 28 Jun 2017 15:21:44 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f36a995424 -s ours
Change-Id: I5a453dd7e4e36f992cf55e8b633cf766280b0fae
TreeHugger Robot [Wed, 28 Jun 2017 15:11:54 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jason Monk [Wed, 28 Jun 2017 14:45:13 +0000 (10:45 -0400)]
Shrink the nav buttons some
Test: visual
Bug:
37115488
Change-Id: Ie013f1644ac9782c10000dc4e4019d99c91680f8
Selim Cinek [Wed, 28 Jun 2017 14:38:21 +0000 (14:38 +0000)]
Merge changes I66f2c52b,I95f72c9d into oc-dr1-dev
am:
68e459918a
Change-Id: Id7fc79cb3aa02889c73efa27f0db9262c3ea7c12
TreeHugger Robot [Wed, 28 Jun 2017 14:30:47 +0000 (14:30 +0000)]
Merge changes I66f2c52b,I95f72c9d into oc-dr1-dev
* changes:
Fixed the accessibility of the reply button
Avoiding weird icon positions
Jason Monk [Wed, 28 Jun 2017 13:44:40 +0000 (13:44 +0000)]
Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev
am:
f10fcafcdf
Change-Id: Ib5a821f92aefb4200ab2aef958813d38820bea74
Jason Monk [Wed, 28 Jun 2017 13:37:51 +0000 (13:37 +0000)]
Merge "Add system to avoid a crash stopping tests from running" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 13:33:44 +0000 (13:33 +0000)]
Merge "Fix a11y volume not always being shown" into oc-dr1-dev
am:
e060044217
Change-Id: Icee419c23ead54f5e0764b9a4cfc3d7f1517ca17
Jason Monk [Wed, 28 Jun 2017 13:26:42 +0000 (13:26 +0000)]
Merge "Fix a11y volume not always being shown" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 13:24:16 +0000 (13:24 +0000)]
Merge "Add plugin to swap out recents" into oc-dr1-dev
am:
a69c03b6b1
Change-Id: Ie662871b2c251444bf6927280053d3705a11337d
Jason Monk [Wed, 28 Jun 2017 13:15:54 +0000 (13:15 +0000)]
Merge "Add plugin to swap out recents" into oc-dr1-dev
Julia Reynolds [Wed, 28 Jun 2017 13:13:09 +0000 (13:13 +0000)]
Merge "Limit when a ranking reconsidering can alert" into oc-dr1-dev
am:
48ab20a645
Change-Id: Iec399c254e41e1c94d67ea2ed5cea637cce148b0
TreeHugger Robot [Wed, 28 Jun 2017 13:06:58 +0000 (13:06 +0000)]
Merge "Limit when a ranking reconsidering can alert" into oc-dr1-dev
Selim Cinek [Wed, 28 Jun 2017 12:17:22 +0000 (14:17 +0200)]
Fixed the accessibility of the reply button
The new button didn't have a content description before
and could therefore not be read.
Change-Id: I66f2c52b50494f7347d5beebc44c7d4fecfd33b2
Fixes:
62639422
Test: manual add reply notification, observe talkback
Selim Cinek [Fri, 9 Jun 2017 02:11:50 +0000 (19:11 -0700)]
Avoiding weird icon positions
When expanding quickly we switch to a linear interpolation.
In this case the last icon may be stuck in between the
shelf position and the notification position, which looks pretty bad.
We therefore optimize this case better to avoid these weird
in-between cases.
Test: manual, expand with various notifications
Fixes:
63088105
Fixes:
62374617
Change-Id: I95f72c9defc6c941a5a6a71829d239529c3861e9
Jack He [Wed, 28 Jun 2017 08:44:01 +0000 (08:44 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)" am:
ceaccbfe70 am:
96f98f255b
am:
3b22538b46
Change-Id: I0a579a4dfd47161b3d9aaccaae9a9a43fcc3bafd
Jack He [Wed, 28 Jun 2017 08:37:50 +0000 (08:37 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)" am:
ceaccbfe70
am:
96f98f255b
Change-Id: I004b05f007def7f995112b867f102fe11b88064d
Jack He [Wed, 28 Jun 2017 08:32:54 +0000 (08:32 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)"
am:
ceaccbfe70
Change-Id: Ic3253ef666632aaaffe8e1547dc563cd3bca9e37
Treehugger Robot [Wed, 28 Jun 2017 08:26:13 +0000 (08:26 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)"
pkanwar [Wed, 28 Jun 2017 05:18:29 +0000 (05:18 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." into oc-dr1-dev
am:
189e5323f1 -s ours
Change-Id: I688ad79a7276cc2d213784e38eb31a592370ee93
TreeHugger Robot [Wed, 28 Jun 2017 05:11:28 +0000 (05:11 +0000)]
Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." into oc-dr1-dev
Jean-Michel Trivi [Wed, 28 Jun 2017 03:25:45 +0000 (03:25 +0000)]
Merge "AudioService: internal API for disabling audio playback for a UID" into oc-dr1-dev
am:
8f81919093
Change-Id: Ie83d16ac25f0bf3cea14822481c47a61c82126c6
Jean-Michel Trivi [Wed, 28 Jun 2017 03:16:51 +0000 (03:16 +0000)]
Merge "AudioService: internal API for disabling audio playback for a UID" into oc-dr1-dev
Lucas Dupin [Wed, 28 Jun 2017 01:17:40 +0000 (18:17 -0700)]
Support dark text on Recents
Test: visual. Set light and dark wallpapers
Change-Id: I100c7d6dac066168636b1741ed1ed7fc309988ef
Fixes:
63080632
Lucas Dupin [Wed, 28 Jun 2017 00:02:02 +0000 (17:02 -0700)]
Replaced overlay target package
Changing from android to com.android.systemui
will keep it from showing up in the settings app.
Bug:
62346335
Bug:
62739503
Test: manual
Change-Id: Ie8864d4508f229f83aec58380136549f3e4fb759
Jean-Michel Trivi [Tue, 27 Jun 2017 02:32:38 +0000 (19:32 -0700)]
AudioService: internal API for disabling audio playback for a UID
Internal API, available through AudioManagerInternal, to flag
a UID as having lost the ability to play audio. When that
happens, all players associated with this UID are paused, and
future players are immediately paused when they report they
started.
Users of this API must "enable" a previously banned UID when
it is no longer in use.
Test: upcoming manual test with background apps
Bug:
34471029
Change-Id: Ic1c103aabe8f3897072b3ce938d84cb949540e23
Adrian Roos [Wed, 28 Jun 2017 00:35:26 +0000 (00:35 +0000)]
Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev
am:
01eb71112c
Change-Id: I0a6239d23fdc484ae54238c5cfff30f69ea40e81
pkanwar [Mon, 22 May 2017 22:23:38 +0000 (15:23 -0700)]
Radio Interface changes to pass the encryption object, including the
key,to the modem.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG:
35606429
Test: manual
(cherry picked from commit
6d50fec388cf382a1f0a4886fe5cea16280f5bdf)
Merged-In: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
TreeHugger Robot [Wed, 28 Jun 2017 00:27:36 +0000 (00:27 +0000)]
Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev
Michael Wright [Wed, 28 Jun 2017 00:26:25 +0000 (00:26 +0000)]
Merge "Update fingerprint haptic patterns" into oc-dr1-dev
am:
4e1050f1cf
Change-Id: Ia689f1f67f63b7921d91669e3ad381587721cd7d
TreeHugger Robot [Wed, 28 Jun 2017 00:16:23 +0000 (00:16 +0000)]
Merge "Update fingerprint haptic patterns" into oc-dr1-dev
Jack He [Sat, 17 Jun 2017 02:43:58 +0000 (19:43 -0700)]
Add APIs to get remote device's battery level (1/2)
* Add BluetoothDevice.getBatteryLevel() API to retreive battery level
information of remote device
* Add BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent to notify user
that remote device's battery level has changed
Bug:
35874078
Test: make, pair with devices and use them
Change-Id: I41051ee25383f5f3a1e505aef6f8c526385f58bd
Jason Monk [Tue, 27 Jun 2017 22:57:51 +0000 (22:57 +0000)]
Merge "Update nav bar layout for universal grid" into oc-dr1-dev
am:
bf15050a0c
Change-Id: Ifbdae7b95603c76f6cc49e5cc3a28a3dfac46a4f
TreeHugger Robot [Tue, 27 Jun 2017 22:49:55 +0000 (22:49 +0000)]
Merge "Update nav bar layout for universal grid" into oc-dr1-dev
Christopher Tate [Tue, 27 Jun 2017 22:36:18 +0000 (22:36 +0000)]
Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev
am:
cbd1f32fdb
Change-Id: Ib6470c085ac5fe023bdbf45523a8c548e202f318
TreeHugger Robot [Tue, 27 Jun 2017 22:30:11 +0000 (22:30 +0000)]
Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev
Christine Franks [Tue, 27 Jun 2017 21:59:34 +0000 (21:59 +0000)]
Merge "Blacklist Night display settings for testing" into oc-dr1-dev
am:
4608c69f23
Change-Id: I9af926344d9703b5754be9ef893527abf6d1a2c7
Michal Karpinski [Tue, 27 Jun 2017 21:57:50 +0000 (21:57 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev am:
0d1b1a253a
am:
a96694b49b
Change-Id: I4cd86be9aac1f13ee8ef67dc797a020e4940c62f
yinxu [Tue, 27 Jun 2017 21:05:17 +0000 (14:05 -0700)]
Use Bundle for inter-process message
The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.
Test: Telephony sanity tests
Bug:
30954762
Change-Id: I77945b247530b85c0b82876d528549498a711550
Christine Franks [Tue, 27 Jun 2017 21:52:12 +0000 (21:52 +0000)]
Merge "Blacklist Night display settings for testing" into oc-dr1-dev
Todd Kennedy [Tue, 27 Jun 2017 21:51:18 +0000 (21:51 +0000)]
Merge "Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312" into oc-dr1-dev
am:
d635fb2003
Change-Id: I10d93e317386856ca6dda4fd920bf71e3eabcb02
Evan Laird [Tue, 27 Jun 2017 21:47:58 +0000 (21:47 +0000)]
Merge "Set bolt and plus colors together" into oc-dr1-dev
am:
c86a5dbee4
Change-Id: I16ac7e9a14a00573beef6db44390720b3bf5530d
Michal Karpinski [Tue, 27 Jun 2017 21:47:36 +0000 (21:47 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
am:
0d1b1a253a
Change-Id: Idd633c178416ababe623f02327a830939ee769ba
Android Build Merger (Role) [Tue, 27 Jun 2017 21:43:42 +0000 (21:43 +0000)]
Merge "Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312" into oc-dr1-dev
Todd Kennedy [Tue, 27 Jun 2017 21:42:07 +0000 (21:42 +0000)]
Merge "Use content type specified on the command line" into oc-dev
am:
f89bf30312
Change-Id: I2eafecfbf73333541a8b28726dc2af0a456443c0
TreeHugger Robot [Tue, 27 Jun 2017 21:40:53 +0000 (21:40 +0000)]
Merge "Set bolt and plus colors together" into oc-dr1-dev
Jason Monk [Fri, 21 Apr 2017 17:48:19 +0000 (13:48 -0400)]
Update nav bar layout for universal grid
Test: visual
Bug:
37115488
Change-Id: I43fe6648f56d25f41fadefcaa27d2c0cf3f077ba
Michal Karpinski [Tue, 27 Jun 2017 20:56:08 +0000 (20:56 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev am:
0d1b1a253a
am:
4b48d48a19
Change-Id: I6e35567cd376666fefb1e9356ce7325595507f77
Todd Kennedy [Tue, 27 Jun 2017 20:49:14 +0000 (20:49 +0000)]
Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312
am:
1f56ccf5f0
Change-Id: Ib0fa2e896764407ad22d199523bb0213e864ee35
Michal Karpinski [Tue, 27 Jun 2017 20:46:55 +0000 (20:46 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
am:
0d1b1a253a
Change-Id: Id2e6a870ff207eb25844ecbeca6b80630b2e0d28
Jason Monk [Tue, 6 Jun 2017 22:05:57 +0000 (18:05 -0400)]
Add plugin to swap out recents
Adds new mechanism for activities in sysui to be replaced by plugins
and allows that to happen for recents.
Test: runtest systemui
Change-Id: I8b570ce7c57484c58a52afe5e247d24ebfa0c57f
Todd Kennedy [Tue, 27 Jun 2017 20:40:47 +0000 (20:40 +0000)]
Merge "Use content type specified on the command line" into oc-dev
am:
f89bf30312
Change-Id: I33dc8db8cf347b43a404cb0d33b7f6a0a005da6a
TreeHugger Robot [Tue, 27 Jun 2017 20:33:23 +0000 (20:33 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 20:30:45 +0000 (20:30 +0000)]
Merge "Use content type specified on the command line" into oc-dev
Shishir Agrawal [Tue, 27 Jun 2017 20:23:50 +0000 (20:23 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6
am:
9c1cdf2f1a
Change-Id: Ia875ed8ec18a6a8800d6c71691598664a3b214ed
Christopher Tate [Tue, 27 Jun 2017 00:35:26 +0000 (17:35 -0700)]
Don't apply locale as part of deferred restore
Once the user has entered normal usage their locale configuration is
essentially guaranteed to be what they intend to use. Don't override
it during deferred restore. (We distinguish based on whether the
device is already marked as 'provisioned'.)
Bug
62224214
Test: manual
Change-Id: Icedef6a86a2b8942937b1384b204def88f2238d2
Android Build Merger (Role) [Tue, 27 Jun 2017 20:17:45 +0000 (20:17 +0000)]
Merge "Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev am:
df2a3295ca" into oc-dr1-dev-plus-aosp
Winson Chung [Tue, 27 Jun 2017 20:16:16 +0000 (20:16 +0000)]
Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev
am:
df2a3295ca
Change-Id: I22d626a3bfc89960271b63eb404dbfbb5456aa0a
Android Build Merger (Role) [Tue, 27 Jun 2017 20:15:49 +0000 (20:15 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
a0376f250f -s ours am:
fb1469df92 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 27 Jun 2017 20:14:06 +0000 (20:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a0376f250f -s ours
am:
fb1469df92 -s ours
Change-Id: Ifb022132551c672231f4077e68d41b65ac6a2c2f
Android Build Merger (Role) [Tue, 27 Jun 2017 20:13:49 +0000 (20:13 +0000)]
Merge "Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6 am:
78b024cb08" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 27 Jun 2017 20:12:54 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
8d16bcef26 -s ours
Change-Id: I2282f0ab89638dce50ed3c6b3ad66604bfe4c1ee
Shishir Agrawal [Tue, 27 Jun 2017 20:12:32 +0000 (20:12 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6
am:
78b024cb08
Change-Id: I688c0d626be99fb1229d4b89e3f1bbdd62bc1c49
Bill Yi [Tue, 27 Jun 2017 20:11:39 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
2619c76cb1 -s ours
Change-Id: Ibcb59e3ae4e87301aa97fd7f7f3e93c64a2ef0f3
Shishir Agrawal [Tue, 27 Jun 2017 20:08:04 +0000 (20:08 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
am:
f1b57080a6
Change-Id: I23d69f5d9b27f893f2b8e8c38f021900d5eb83c2
Bill Yi [Tue, 27 Jun 2017 20:06:09 +0000 (20:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a0376f250f -s ours
am:
503eab4469 -s ours
Change-Id: I4144956fc0670fb706b11348ae140c122cde81a7
Shishir Agrawal [Tue, 27 Jun 2017 20:05:04 +0000 (20:05 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
am:
f1b57080a6
Change-Id: I879ad445f1dd1a2c39e71dd29bf155865318eead
Winson Chung [Tue, 27 Jun 2017 20:03:55 +0000 (20:03 +0000)]
Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev
Bill Yi [Tue, 27 Jun 2017 20:02:19 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
852e0aacc2 -s ours
Change-Id: Ic393c2f71f4f0d5fe201936acaeded3be9c741d5
Bill Yi [Tue, 27 Jun 2017 20:01:46 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a0376f250f -s ours
Change-Id: I5331ee04e4cd08a2280e07c06f973329a3c41ab4
Bill Yi [Tue, 27 Jun 2017 19:59:48 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a0376f250f -s ours
Change-Id: Iebd88570c6104dceaa4344c0ab2f53f354fa0ba9
OSDN Git Service
