OSDN Git Service
Lorenzo Colitti [Tue, 24 May 2016 03:19:32 +0000 (03:19 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev
am:
d954c6368f
* commit '
d954c6368fc6e591385e608fa6ebb42dc7606074':
Support IPv6 multicast filtering in APF.
Change-Id: I99641c19b2b0014d313e281070d5888a3759588f
Lorenzo Colitti [Tue, 24 May 2016 03:14:37 +0000 (03:14 +0000)]
Merge "Support IPv6 multicast filtering in APF." into nyc-dev
Pavlin Radoslavov [Tue, 24 May 2016 02:34:28 +0000 (02:34 +0000)]
Reduced the impact of "synchronized" statements
am:
eb50a39e98
* commit '
eb50a39e98acb78d16465041bb5c172aa1637e97':
Reduced the impact of "synchronized" statements
Change-Id: I60a4b0e656b283f83c49c3c0211943b4854867e0
Pavlin Radoslavov [Mon, 23 May 2016 05:16:41 +0000 (22:16 -0700)]
Reduced the impact of "synchronized" statements
* Removed "synchronized" statements that are not needed
* Replaced "synchronized" statements with Read/Write lock as
appropriate. The lock protects the access to and the setting of
BluetoothAdapter.mService and BluetoothManagerService.mBluetooth and
associated state.
Bug:
28734075
Bug:
28799467
Change-Id: I8f8281c505f0a1ae0add1e14a3caba1f5b2a98e4
Dianne Hackborn [Tue, 24 May 2016 00:30:30 +0000 (00:30 +0000)]
Merge "Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev
am:
9c252700f6
* commit '
9c252700f6686767f5418677800ba171f441dddc':
Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x
Change-Id: I9f3aa6eedbf66eceee0fcaed95a862bea656e359
Jaewan Kim [Tue, 24 May 2016 00:22:31 +0000 (00:22 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev
am:
75822138ad
* commit '
75822138ad7f676592c5655df96fe76200b6ffb3':
PIP: Handle configuration changes
Change-Id: I976b3e89aa4bc255138f411c855ab0ad1d8c50bd
Dianne Hackborn [Tue, 24 May 2016 00:18:38 +0000 (00:18 +0000)]
Merge "Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev
Jaewan Kim [Tue, 24 May 2016 00:05:26 +0000 (00:05 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev
Erik Kline [Mon, 23 May 2016 23:29:07 +0000 (23:29 +0000)]
Merge "Support DHCPv4 rebinding state" into nyc-dev
am:
4bf3157c45
* commit '
4bf3157c4560148b9b3f2e6aec7ed0835f6af14a':
Support DHCPv4 rebinding state
Change-Id: I885181616444d19974085637f80f459c9152ac7d
Erik Kline [Mon, 23 May 2016 23:19:03 +0000 (23:19 +0000)]
Merge "Support DHCPv4 rebinding state" into nyc-dev
Adrian Roos [Mon, 23 May 2016 23:14:35 +0000 (23:14 +0000)]
Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am:
d15cc7a83e
* commit '
d15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
Deprecate unnecessairy Notification.Style constructors
Change-Id: I35dac10df46e313fbe013fcc09337f8e9ac95890
TreeHugger Robot [Mon, 23 May 2016 23:04:35 +0000 (23:04 +0000)]
Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
Dianne Hackborn [Mon, 23 May 2016 21:39:45 +0000 (14:39 -0700)]
Fix issue #
28868955: CTS: PendingIntentTest failures; Regressed in NRD48x
Uh, yeah.
Change-Id: I452187fcdda634ebf00e5d6bcaa45433f348c17e
Adrian Roos [Mon, 23 May 2016 20:56:15 +0000 (13:56 -0700)]
Deprecate unnecessairy Notification.Style constructors
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes:
28775574
Wale Ogunwale [Mon, 23 May 2016 20:59:00 +0000 (20:59 +0000)]
Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
am:
42d4a337a3
* commit '
42d4a337a3b1a14f4d9daf6eb8275a01ba20e680':
Only resuming starting dontWaitForPause activity once
Change-Id: I5cc6a322d6c3cdd9bd28ea4a996fe960b1cefd81
Jean-Michel Trivi [Mon, 23 May 2016 20:56:04 +0000 (20:56 +0000)]
Merge "Recording activity notification: return list of configuration" into nyc-dev
am:
c991879f29
* commit '
c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
Recording activity notification: return list of configuration
Change-Id: I926b2cacd7a645ec42f249a0d45a6a822f05eded
TreeHugger Robot [Mon, 23 May 2016 20:51:39 +0000 (20:51 +0000)]
Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
Jean-Michel Trivi [Mon, 23 May 2016 20:49:28 +0000 (20:49 +0000)]
Merge "Recording activity notification: return list of configuration" into nyc-dev
Jason Monk [Mon, 23 May 2016 20:07:08 +0000 (20:07 +0000)]
Merge "Make battery labels translatable." into nyc-dev
am:
14abed66d7
* commit '
14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
Make battery labels translatable.
Change-Id: Ic945adf122822b17d91ade4cf0a1d7eb4e6b4cb9
Sid Soundararajan [Mon, 23 May 2016 20:01:38 +0000 (20:01 +0000)]
Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev
am:
0513125c92
* commit '
0513125c92789912214235faad26e7a97184a53a':
Add a check to adjust thumbnail scaling for full screen shots on TV
Change-Id: I617796ca2d7476801517587cf81f29f8edc93d2d
Jason Monk [Mon, 23 May 2016 19:58:48 +0000 (19:58 +0000)]
Merge "Make battery labels translatable." into nyc-dev
Sid Soundararajan [Mon, 23 May 2016 19:56:42 +0000 (19:56 +0000)]
Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev
Joe Onorato [Mon, 23 May 2016 19:50:45 +0000 (19:50 +0000)]
Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
am:
4dbdd5d971
* commit '
4dbdd5d97155364305abf7c010c165f1a6f79edb':
Add data from /proc/pagetypeinfo to procstats.
Change-Id: Ic86eb0ad4278dc2d0b7f93148bab00a1f707dc16
TreeHugger Robot [Mon, 23 May 2016 19:46:48 +0000 (19:46 +0000)]
Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
Selim Cinek [Mon, 23 May 2016 19:34:16 +0000 (19:34 +0000)]
Merge "Fixed a flashing when the affordances were launched" into nyc-dev
am:
a56e732c01
* commit '
a56e732c01f10ebd27185a66ee4330f50c8cd57b':
Fixed a flashing when the affordances were launched
Change-Id: I0a03111befb2e5136aac2d07f1b07af4131aaf6c
Selim Cinek [Mon, 23 May 2016 19:34:12 +0000 (19:34 +0000)]
Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev
am:
7fc88ac214
* commit '
7fc88ac2144a05f04a941d969f86f959a89916d8':
Fixed a bug where the scrim could flash black when snoozing huns
Change-Id: I82af9d5a47a63fff0bed8adaedc7a96647a54f19
Selim Cinek [Mon, 23 May 2016 19:26:22 +0000 (19:26 +0000)]
Merge "Fixed a flashing when the affordances were launched" into nyc-dev
Selim Cinek [Mon, 23 May 2016 19:26:01 +0000 (19:26 +0000)]
Merge "Fixed a crash with the autocancelling" into nyc-dev
am:
4a4b76f6e8
* commit '
4a4b76f6e842a4578dffedb2800d2b8eca813769':
Fixed a crash with the autocancelling
Change-Id: I89e6a7e66166f81bc44ce8c6e5cf3c21e06693cc
Selim Cinek [Mon, 23 May 2016 19:25:55 +0000 (19:25 +0000)]
Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 19:21:56 +0000 (19:21 +0000)]
Merge "Fixed a crash with the autocancelling" into nyc-dev
Chong Zhang [Mon, 23 May 2016 19:08:04 +0000 (19:08 +0000)]
Merge "Don\'t include removed window when counting interesting windows" into nyc-dev
am:
18ef543102
* commit '
18ef5431026365dd3b53a505fc57f538cf8dd48e':
Don't include removed window when counting interesting windows
Change-Id: Iea9bc7a6c2ae5043aaea6b9d48fbb1dfd49d5fc7
Chris Wren [Mon, 23 May 2016 19:01:27 +0000 (19:01 +0000)]
Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev
am:
28d9ef8112
* commit '
28d9ef811291921ddb22e7b4b92e1222e673154e':
Don't throw RemoteException from new NLS APIs
Change-Id: I8a89c5e4b800baf8c810eb24b0b5435fa63b1378
Chong Zhang [Mon, 23 May 2016 18:59:03 +0000 (18:59 +0000)]
Merge "Don't include removed window when counting interesting windows" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 18:54:17 +0000 (18:54 +0000)]
Merge "Don't throw RemoteException from new NLS APIs" into nyc-dev
Victor Chang [Mon, 23 May 2016 18:49:23 +0000 (18:49 +0000)]
Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev
am:
7c527bf76d
* commit '
7c527bf76dcdcda414f10ed829999310f46161e7':
Fix Certificate authority installed notification is gone when turning off and on the work mode.
Change-Id: I49885b9bffb4c16f52f7ed471b1019dfb7fe85f4
Chong Zhang [Sat, 21 May 2016 16:23:55 +0000 (09:23 -0700)]
Don't include removed window when counting interesting windows
Also do not give input focus to window that's already marked for removal.
The input channel is already disposed and input manager will treat these
as null focus.
bug:
28797800
Change-Id: I3cb2d514a7286847f1ad6af3f629d04c303d3cbd
Jason Monk [Mon, 23 May 2016 18:42:23 +0000 (14:42 -0400)]
Make battery labels translatable.
Bug:
28829629
Change-Id: Id32587a4ad22aa79f7ec01f748466d6ff2394bcc
Victor Chang [Mon, 23 May 2016 18:42:08 +0000 (18:42 +0000)]
Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev
Philip P. Moltmann [Mon, 23 May 2016 18:37:47 +0000 (18:37 +0000)]
Merge "Correct height of add printer list separator" into nyc-dev
am:
80c18bcc3a
* commit '
80c18bcc3a52dee62eec4b95de1ebfbf3c7d397f':
Correct height of add printer list separator
Change-Id: Ib3b93ec7f2bd12b077353b3ac3f671a68bf97d34
Joe Onorato [Thu, 19 May 2016 22:46:00 +0000 (15:46 -0700)]
Add data from /proc/pagetypeinfo to procstats.
This data tells us the number of pages of each type that
are available by page size. It is collected each time
the procstats snapshot is taken, and printed in the
checkin and verbose (dumpsys procstats -a) modes.
Change-Id: I14562eac15833617391c560638a9e7d239ef8db6
Winson [Mon, 23 May 2016 18:30:54 +0000 (18:30 +0000)]
Removing extra haptic feedback.
am:
7660bca509
* commit '
7660bca5099b1a568e025345f1ba0aa68793e15a':
Removing extra haptic feedback.
Change-Id: If87dfc0227eee3246eb145c566851057912b4588
Philip P. Moltmann [Mon, 23 May 2016 18:27:13 +0000 (18:27 +0000)]
Merge "Correct height of add printer list separator" into nyc-dev
Winson [Sat, 21 May 2016 17:51:19 +0000 (10:51 -0700)]
Removing extra haptic feedback.
- ag/923796 changed the logic to always return true, so these extra
calls are no longer needed.
Bug:
28867314
Change-Id: I07a4f6ac772a1444bba1950b2f27aa4be58a8419
Wale Ogunwale [Mon, 23 May 2016 18:13:13 +0000 (18:13 +0000)]
Merge "Fixed flicker when docking task from recents." into nyc-dev
am:
bc0a5cb2f8
* commit '
bc0a5cb2f8b5cac550196b535d91e07bb586f647':
Fixed flicker when docking task from recents.
Change-Id: I6b1715f666f0085dc9b43f557493d16655bf0297
Suprabh Shukla [Mon, 23 May 2016 18:03:35 +0000 (18:03 +0000)]
Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev
am:
653e7bedb4
* commit '
653e7bedb4ea95f69c109d54ddd0b7a49e6530c6':
Fixing isOpRestricted in AppOpsService
Change-Id: Id2088da325739336bfc628da2ddd4850d0d2e6fb
TreeHugger Robot [Mon, 23 May 2016 18:01:12 +0000 (18:01 +0000)]
Merge "Fixed flicker when docking task from recents." into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 17:57:49 +0000 (17:57 +0000)]
Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev
Selim Cinek [Mon, 23 May 2016 17:56:34 +0000 (10:56 -0700)]
Fixed a crash with the autocancelling
Change-Id: If9cb9cc89bafbc9e7e053b4758382239bac97adc
Fixes:
28878632
Fixes:
28898623
Wale Ogunwale [Mon, 23 May 2016 17:56:33 +0000 (10:56 -0700)]
Only resuming starting dontWaitForPause activity once
For a starting activity that doesn't wait for pause, we can resume it
when ensuring visible activities when pausing back stacks. If this
happens, there is no need to try to resume it again.
Bug:
28853615
Change-Id: Iee40b80eb13ab3fd65fdce0c100c4051e64f229f
Chris Wren [Mon, 23 May 2016 17:47:29 +0000 (17:47 +0000)]
Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev
am:
0a9ccf2619
* commit '
0a9ccf26192bc5a6fd74afb7afd4834b08230299':
Never fetch notification badges for USER_SYSTEM
Change-Id: I0e4bd4aaf4c6513c289ca948f63c5bc5c3c7ed02
Chris Wren [Mon, 23 May 2016 17:44:14 +0000 (17:44 +0000)]
Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev
Sid Soundararajan [Wed, 11 May 2016 23:40:49 +0000 (16:40 -0700)]
Add a check to adjust thumbnail scaling for full screen shots on TV
This should let us get away with taking smaller bitmaps for TV.
BUG:
28371792
Change-Id: Ia5d43dd48c57c4dd519b46f0c0d0ec94df5f42a9
Tony Mak [Mon, 23 May 2016 17:23:51 +0000 (17:23 +0000)]
Merge "Remove PROPERTY_WORK_CALL" into nyc-dev
am:
5ee420c0d5
* commit '
5ee420c0d562e9ff55fe9bf03c746bc76fd40d5e':
Remove PROPERTY_WORK_CALL
Change-Id: I038ac8c085d5f6590cf8dfa0abc0864da3dd89e2
Winson [Mon, 23 May 2016 17:23:47 +0000 (17:23 +0000)]
Catching all exceptions when docking.
am:
f60a4af047
* commit '
f60a4af04779174b39b7d3d277de88ed1204d024':
Catching all exceptions when docking.
Change-Id: I6f7d31e267686de5f9b12161469ca1490de23b15
Tony Mak [Mon, 23 May 2016 17:17:26 +0000 (17:17 +0000)]
Merge "Remove PROPERTY_WORK_CALL" into nyc-dev
Winson [Sat, 21 May 2016 17:39:53 +0000 (10:39 -0700)]
Catching all exceptions when docking.
- Catch all exceptions thrown when docking an activity (similar to when
we start an activity) to allow us to gracefully handle the failure and
animate the task back into the stack.
Bug:
28867188
Change-Id: I3f80d261343c0161c5cbfd08a05a1fc6157f653e
Philip P. Moltmann [Mon, 23 May 2016 16:43:42 +0000 (09:43 -0700)]
Correct height of add printer list separator
Do not use listPreferredItemHeightSmall a height for list separator.
Fixes:
28907033
Change-Id: Ibe9744f28e7bd17fb5a298fa3cff0e3d403de10f
Jean-Michel Trivi [Thu, 19 May 2016 17:42:35 +0000 (10:42 -0700)]
Recording activity notification: return list of configuration
Use a list of configurations instead of an array
Bug
28819230
Change-Id: Ia4a3cdabf8337cfb98abe4d0055d497bcab8a5ee
Victor Chang [Mon, 23 May 2016 16:37:01 +0000 (17:37 +0100)]
Fix Certificate authority installed notification is gone when turning off and on the work mode.
cause: Work mode is turned on before entering USER_STOPPED state.
Thus, BOOT_COMPLETED broadcast is not sent, but the notification has been dismissed.
use USER_STARTED + USER_UNLOCKED because both are foreground.
Bug:
28864104
Change-Id: I4796b61586e194d8367b9e52a9c56f858cbcbe7d
Wale Ogunwale [Mon, 23 May 2016 16:10:24 +0000 (09:10 -0700)]
Fixed flicker when docking task from recents.
Regression introduced by ag/
1044640 where we don't want recents to the
visible if it's stack isn't fullscreen or focused. However, it is
possible for switching the home stack to not-fullscreen to prolonged
while transitioning to split-screen mode from recents. We now check
for if the docked stack exists which is a better indicator we are in
split-screen mode regardless of if the stask is fullscreen.
Bug:
28882948
Bug:
28246419
Change-Id: I54c02cc1486e7b5bf6a20dd0706c9bfe3f40a953
Bill Yi [Mon, 23 May 2016 16:03:30 +0000 (16:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
6a983faab3 -s ours
* commit '
6a983faab35cc4f22611b0cb8041f4dcbac545dc':
Import translations. DO NOT MERGE
Change-Id: Ibafdfdf355699c6a8d8461928400639e692500b2
Bill Yi [Mon, 23 May 2016 16:03:27 +0000 (16:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7d1246e95d -s ours
* commit '
7d1246e95d0815424e6654af4ef613a7726551b1':
Import translations. DO NOT MERGE
Change-Id: I8fb493e8cd0005c0269c86209a48cd5e31179f81
Bill Yi [Mon, 23 May 2016 16:03:23 +0000 (16:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
05be3b4541 -s ours
* commit '
05be3b454134afc73ae44cda88af10bead5324a6':
Import translations. DO NOT MERGE
Change-Id: Ibdb1ab97fd2995e507cec35a52a30063e91c5ff9
TreeHugger Robot [Mon, 23 May 2016 15:49:53 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 23 May 2016 15:49:19 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
fa65d11a21 -s ours
* commit '
fa65d11a21700634a52311190f40d5fd64535e8e':
Import translations. DO NOT MERGE
Change-Id: I16981cd6000b92784f640ac979c373a60c59e839
TreeHugger Robot [Mon, 23 May 2016 15:48:14 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 15:47:59 +0000 (15:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 15:35:52 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Lorenzo Colitti [Thu, 19 May 2016 15:04:43 +0000 (00:04 +0900)]
Support IPv6 multicast filtering in APF.
For now this just drops all non-ICMPv6 packets to ff00::/8 when
mMulticastFilter is true. Multicast ICMPv6 is already mostly
dealt with by other filters - the L2 multicast filter, the RA
filter, the multicast NA filter, and ND offload.
Bug:
28393601
Change-Id: Ia7b0d4f00fac6710093befe6a726b46677a5f20b
Erik Kline [Tue, 26 Apr 2016 09:41:09 +0000 (18:41 +0900)]
Support DHCPv4 rebinding state
Bug:
24837343
Change-Id: Id49e1c12ec3b11fedba42bb28348a00cb0b11169
Bill Yi [Mon, 23 May 2016 13:21:44 +0000 (06:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6a67ee6c7f1c034eaea3885f13884f6c7add477d
Auto-generated-cl: translation import
Victor Chang [Mon, 23 May 2016 11:58:41 +0000 (11:58 +0000)]
Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
am:
d86ac8116b
* commit '
d86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
New api in LockSettingsService to get StrongAuth synchronously
Change-Id: I3fe13c51d5d33f5689f0b4130a33cf3a2777e186
Victor Chang [Mon, 23 May 2016 11:51:54 +0000 (11:51 +0000)]
Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
Lorenzo Colitti [Mon, 23 May 2016 09:10:55 +0000 (09:10 +0000)]
Merge "Only actually log the DNS events we have." into nyc-dev
am:
cb98809657
* commit '
cb988096570de8af4883ae3bdea06c88f8fd235a':
Only actually log the DNS events we have.
Change-Id: I6fa83369e45fbf0a33c0519cc47e5d3f21321463
TreeHugger Robot [Mon, 23 May 2016 09:01:44 +0000 (09:01 +0000)]
Merge "Only actually log the DNS events we have." into nyc-dev
Bill Yi [Mon, 23 May 2016 08:53:03 +0000 (01:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I23d94944484c50e6fae32f95b34406055078299e
Auto-generated-cl: translation import
Bill Yi [Mon, 23 May 2016 08:42:41 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c447305120cc398cbd0e7a98b8226ee7c632059
Auto-generated-cl: translation import
Bill Yi [Mon, 23 May 2016 08:20:28 +0000 (01:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22fbf5ac36b91251a267bbf1863ca1b1e914d032
Auto-generated-cl: translation import
Lorenzo Colitti [Mon, 23 May 2016 05:10:19 +0000 (14:10 +0900)]
Only actually log the DNS events we have.
DnsEventListenerService#logAndClear was always logging 100 DNS
events regardless of how many were actually logged. The rest of
the events were either all zero or previously-recorded events.
Bug:
28204408
Change-Id: I9da3b07a2e7b7512397a3eb6568a877815eb3312
Chad Brubaker [Mon, 23 May 2016 02:32:19 +0000 (02:32 +0000)]
Merge "Use an attribute for the network security config resource" into nyc-dev
am:
6812bdf387
* commit '
6812bdf38797101d3744befe70f3501b75f01ce6':
Use an attribute for the network security config resource
Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260
TreeHugger Robot [Mon, 23 May 2016 02:23:25 +0000 (02:23 +0000)]
Merge "Use an attribute for the network security config resource" into nyc-dev
Jaewan Kim [Fri, 20 May 2016 01:28:17 +0000 (10:28 +0900)]
PIP: Handle configuration changes
Bug:
28727532
Change-Id: I2a566082fa88984ef56d6ed8515c9bcd6a6ea868
Baligh Uddin [Sun, 22 May 2016 23:34:39 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
917ead578b -s ours
* commit '
917ead578baa6fba7e8e45756c67c879bb912364':
Import translations. DO NOT MERGE
Change-Id: I5359b0ee4ae342ed910fa7b888f1dcd621c4fd35
Baligh Uddin [Sun, 22 May 2016 23:34:36 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7533f3260e -s ours
* commit '
7533f3260e888c6edc709b02eafdb5722172ecc2':
Import translations. DO NOT MERGE
Change-Id: I1eeeb4510ca635af93a97af9950dc2b54914199b
Baligh Uddin [Sun, 22 May 2016 23:34:33 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
41a1d11f98 -s ours
* commit '
41a1d11f98d170ed41935d35fc1a3ed4af2c59fd':
Import translations. DO NOT MERGE
Change-Id: I2e0d39f64f0ebd738cad7d7676eb809f1fe88db7
Baligh Uddin [Sun, 22 May 2016 23:34:29 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
83378cb136 -s ours
* commit '
83378cb13689fa73be349a9ce4b0802ed64fc935':
Import translations. DO NOT MERGE
Change-Id: Id406199ec77f14e947db6f7c65a2f3b65795374d
Baligh Uddin [Sun, 22 May 2016 23:32:35 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
23b665d65c -s ours
* commit '
23b665d65cd06c38a3ffb8301f4b47ca00eaa5a3':
Import translations. DO NOT MERGE
Change-Id: Ie2e6a2515d39cd5284946abba39f9800d020d32b
Baligh Uddin [Sun, 22 May 2016 23:32:29 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
97360f90ce -s ours
* commit '
97360f90ce2015f56b860692dabe0aa82786a888':
Import translations. DO NOT MERGE
Change-Id: Iae715670385932f22208abd984b7add31c1a0084
Baligh Uddin [Sun, 22 May 2016 23:32:22 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a4bfd03cd5 -s ours
* commit '
a4bfd03cd53aeac1c608fde7faa1f2c5a043a6ce':
Import translations. DO NOT MERGE
Change-Id: I2bba6312b1aa23a3768fb2a72529ac0d9351cb12
Baligh Uddin [Sun, 22 May 2016 23:32:15 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
83a23d290d -s ours
* commit '
83a23d290da639131c610521c729f851d13c7112':
Import translations. DO NOT MERGE
Change-Id: I04d8d0b14886a09c5acb42567b038173af84cc76
Baligh Uddin [Sun, 22 May 2016 23:32:06 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
71c4e0b44a -s ours
* commit '
71c4e0b44acbf60c396de4984ddc498163c708e1':
Import translations. DO NOT MERGE
Change-Id: Ic16aa366bbacc24faa14223f5840b2847ff5e1dd
Baligh Uddin [Sun, 22 May 2016 23:27:08 +0000 (23:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
24708d9c8e -s ours
* commit '
24708d9c8e54701d6c3ee20f72e8dfb09d0f5c75':
Import translations. DO NOT MERGE
Change-Id: I1f93f0ce7bdbf80b0c13fbd3678c08675e7396e8
Baligh Uddin [Sun, 22 May 2016 23:26:36 +0000 (23:26 +0000)]
Import translations. DO NOT MERGE
am:
cd669b648a -s ours
* commit '
cd669b648a94a14d32ce942a5004b73784dcad3c':
Import translations. DO NOT MERGE
Change-Id: Ibb9c31f010802d141ec383d3a49100a570f29ec4
Baligh Uddin [Sun, 22 May 2016 23:22:28 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:22:16 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:47 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:43 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:38 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:36 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Sun, 22 May 2016 23:21:33 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
OSDN Git Service
