OSDN Git Service
Dianne Hackborn [Tue, 24 May 2016 00:30:32 +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: Ib2811fb49299da93459066d9d6312d403681eed4
Jaewan Kim [Tue, 24 May 2016 00:22:27 +0000 (00:22 +0000)]
Merge "PIP: Handle configuration changes" into nyc-dev
am:
75822138ad
* commit '
75822138ad7f676592c5655df96fe76200b6ffb3':
PIP: Handle configuration changes
Change-Id: Ic01a93b2031693b9051312598c084e871d84fedc
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:28:57 +0000 (23:28 +0000)]
Merge "Support DHCPv4 rebinding state" into nyc-dev
am:
4bf3157c45
* commit '
4bf3157c4560148b9b3f2e6aec7ed0835f6af14a':
Support DHCPv4 rebinding state
Change-Id: If31de53174e64e154152b7baa60f23a387092e87
Erik Kline [Mon, 23 May 2016 23:19:03 +0000 (23:19 +0000)]
Merge "Support DHCPv4 rebinding state" into nyc-dev
Fyodor Kupolov [Mon, 23 May 2016 23:18:15 +0000 (23:18 +0000)]
Merge "Additional clean up in onUserRemovedLPw" into nyc-mr1-dev
Adrian Roos [Mon, 23 May 2016 23:15:29 +0000 (23:15 +0000)]
Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am:
d15cc7a83e
* commit '
d15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
Deprecate unnecessairy Notification.Style constructors
Change-Id: I584f2e8ce46358ecdcb1189f3e46400d6f07d346
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
Fyodor Kupolov [Mon, 23 May 2016 21:22:38 +0000 (14:22 -0700)]
Additional clean up in onUserRemovedLPw
mDefaultPermissionsGranted, mFingerprints should be cleaned up.
Bug:
28913107
Change-Id: I3758985fe742d38e43538b5221fc3f436c55cb16
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:58:58 +0000 (20:58 +0000)]
Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
am:
42d4a337a3
* commit '
42d4a337a3b1a14f4d9daf6eb8275a01ba20e680':
Only resuming starting dontWaitForPause activity once
Change-Id: Idb9949737a0ee5cfbabd6fad532f24f7ec769ace
Jean-Michel Trivi [Mon, 23 May 2016 20:55:58 +0000 (20:55 +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: I02faeadaae995371e2d723415f0b2e3a78f2c489
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:03:51 +0000 (20:03 +0000)]
Merge "Make battery labels translatable." into nyc-dev
am:
14abed66d7
* commit '
14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
Make battery labels translatable.
Change-Id: I634eca6f143a5a6d103f49107e57db879b2ca633
Sid Soundararajan [Mon, 23 May 2016 20:01:03 +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: I057727feb949fc864c3396ef53f9fba331f65ba8
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:36 +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: I3c455fe69244927dc5aebdf5ddb7b0badf6aeee8
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:12 +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: I142fde45dd14de96f58289a8aed1113d3bf8578a
Selim Cinek [Mon, 23 May 2016 19:34:08 +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: I630704c54dbe15652172d7d723e211568e021082
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:25:55 +0000 (19:25 +0000)]
Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev
Selim Cinek [Mon, 23 May 2016 19:25:51 +0000 (19:25 +0000)]
Merge "Fixed a crash with the autocancelling" into nyc-dev
am:
4a4b76f6e8
* commit '
4a4b76f6e842a4578dffedb2800d2b8eca813769':
Fixed a crash with the autocancelling
Change-Id: I09e52b5ac392edaae7f42c7cb1903f60421b03bc
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:00 +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: I3c2202e3928720161dbce8d1b4cfa0f16f83179f
Chris Wren [Mon, 23 May 2016 19:01:21 +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: Ibafc3d9adeb046b2b43593285b6f605693b8682e
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:16 +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: If3e915aa66d29f70c217b3231937730c63f7e9eb
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:38:36 +0000 (18:38 +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: I3cfdf14bc4e72b727f6469f99f950794e667ce33
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:34 +0000 (18:30 +0000)]
Removing extra haptic feedback.
am:
7660bca509
* commit '
7660bca5099b1a568e025345f1ba0aa68793e15a':
Removing extra haptic feedback.
Change-Id: I91237da897bfeeb89405e4e44828e1c312eee951
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:12:38 +0000 (18:12 +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: I706798a9561613033af637473bf98b8fb72a8ca4
Suprabh Shukla [Mon, 23 May 2016 18:03:32 +0000 (18:03 +0000)]
Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev
am:
653e7bedb4
* commit '
653e7bedb4ea95f69c109d54ddd0b7a49e6530c6':
Fixing isOpRestricted in AppOpsService
Change-Id: Ic73cd0e420b5ed3efec3e8f34df1e350cf227944
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: Ic6530a6b92c26d68a25ab15d24779b5f3f10f35a
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:26:45 +0000 (17:26 +0000)]
Merge "Remove PROPERTY_WORK_CALL" into nyc-dev
am:
5ee420c0d5
* commit '
5ee420c0d562e9ff55fe9bf03c746bc76fd40d5e':
Remove PROPERTY_WORK_CALL
Change-Id: I17d204d01b2fc356fa6b70d4c5cd73f4b0a10d6c
Winson [Mon, 23 May 2016 17:26:43 +0000 (17:26 +0000)]
Catching all exceptions when docking.
am:
f60a4af047
* commit '
f60a4af04779174b39b7d3d277de88ed1204d024':
Catching all exceptions when docking.
Change-Id: I7ed98c617e3cdc241546d085ede23f49445cd223
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 15:57:49 +0000 (15:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
6a983faab3 -s ours
* commit '
6a983faab35cc4f22611b0cb8041f4dcbac545dc':
Import translations. DO NOT MERGE
Change-Id: If7150468a26a9a259b7696d2ee3594518ba0a213
Bill Yi [Mon, 23 May 2016 15:57:47 +0000 (15:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
7d1246e95d -s ours
* commit '
7d1246e95d0815424e6654af4ef613a7726551b1':
Import translations. DO NOT MERGE
Change-Id: I320c2898acb42393e12e98e2b750bbc854f634d2
Bill Yi [Mon, 23 May 2016 15:57:45 +0000 (15:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
05be3b4541 -s ours
* commit '
05be3b454134afc73ae44cda88af10bead5324a6':
Import translations. DO NOT MERGE
Change-Id: I94238461acc288413140d20799142aba4dd7c353
TreeHugger Robot [Mon, 23 May 2016 15:49:53 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Android Build Merger (Role) [Mon, 23 May 2016 15:49:36 +0000 (15:49 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am:
fa65d11a21 -s ours" into nyc-mr1-dev
Bill Yi [Mon, 23 May 2016 15:49:07 +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: Ia8ce2502ca409b0f462803f0e08b4f0d19c6faa2
TreeHugger Robot [Mon, 23 May 2016 15:48:45 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 23 May 2016 15:48:30 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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:47:02 +0000 (15:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 23 May 2016 15:35:52 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 23 May 2016 15:35:12 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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:27:51 +0000 (06:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib90b6a912d4d92b18051d73e63aada7ff036678e
Auto-generated-cl: translation import
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:59:02 +0000 (11:59 +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: I07d18fd5c472f1ab3f3ad4c37583e9092f4431b4
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:52 +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: I97340d6b0483961d848e6f604a112636000675af
Bill Yi [Mon, 23 May 2016 09:03:02 +0000 (02:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae2663ea18069432c84ffe5c4f01cf3cf8b1d7ff
Auto-generated-cl: translation import
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:47:37 +0000 (01:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4bf63c7c9d2e24184607f05914e8e063e8792d45
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:39:59 +0000 (01:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic4303b94f9db348046f063592289d81b40bf88a9
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: I470b8e991d590135223066d18b49ff123e0b1f6e
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:36 +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: If76389179f7a687e1eefa96f629664b7e7bdbb21
Baligh Uddin [Sun, 22 May 2016 23:34:35 +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: I8bb034309c4319df4caa65ae7b8124cb49ccb414
Baligh Uddin [Sun, 22 May 2016 23:34:32 +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: Iff3f171fe3e678cfa9c16b2d01b87e4d5e949eeb
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: Ifc6608f6a98af55eeb61362b87a4413d22eb748f
Baligh Uddin [Sun, 22 May 2016 23:32:25 +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: I5de0c8f54bd25c5d3408ebc7fa3f821474be843b
Baligh Uddin [Sun, 22 May 2016 23:32:20 +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: I0cb6ae304f8c8980d5c3f78773e20aa354a02940
Baligh Uddin [Sun, 22 May 2016 23:32:13 +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: Ie23ebc312c113a27aae6b8dbde5d6512145eee92
Baligh Uddin [Sun, 22 May 2016 23:32:06 +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: Iab80cfac9fae2e5e6963211225fabc8823d12ac6
Baligh Uddin [Sun, 22 May 2016 23:31:58 +0000 (23:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
71c4e0b44a -s ours
* commit '
71c4e0b44acbf60c396de4984ddc498163c708e1':
Import translations. DO NOT MERGE
Change-Id: Ibeae7a0b2ad0b5180018fd4ec3d668d476d25b56
Baligh Uddin [Sun, 22 May 2016 23:26:51 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
24708d9c8e -s ours
* commit '
24708d9c8e54701d6c3ee20f72e8dfb09d0f5c75':
Import translations. DO NOT MERGE
Change-Id: Id96597e05d8bb1b74a9290445f76c0b645e238b3
Baligh Uddin [Sun, 22 May 2016 23:26:27 +0000 (23:26 +0000)]
Import translations. DO NOT MERGE
am:
cd669b648a -s ours
* commit '
cd669b648a94a14d32ce942a5004b73784dcad3c':
Import translations. DO NOT MERGE
Change-Id: Ib51bc589a3e9aa698d1738275142ecab7adec6de
Baligh Uddin [Sun, 22 May 2016 23:22:28 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev