OSDN Git Service
Android Build Merger (Role) [Tue, 12 Jul 2016 16:29:00 +0000 (16:29 +0000)]
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am:
a8b4e7320a -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jul 2016 16:28:44 +0000 (16:28 +0000)]
Merge "Merge \"Merge \\"App launch - Test app changes\\" into nyc-dev am:
8fabbb89c0\" into nyc-mr1-dev am:
3998b7a54b" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jul 2016 16:28:32 +0000 (16:28 +0000)]
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am:
fd3dc6d96d -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Tue, 12 Jul 2016 16:27:38 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
a8b4e7320a -s ours
Change-Id: Ia3155124b7367bfec936160db2ce5fbc14ae6cb1
Gopinath [Tue, 12 Jul 2016 16:27:34 +0000 (16:27 +0000)]
Merge \"Merge \\"App launch - Test app changes\\" into nyc-dev am:
8fabbb89c0\" into nyc-mr1-dev
am:
3998b7a54b
Change-Id: I12f4663266153c0ed1c8fcf14104182158f494f5
Bill Yi [Tue, 12 Jul 2016 16:27:27 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
fd3dc6d96d -s ours
Change-Id: I93a17573d5be751e02698e8731fd383b67db11a3
Gopinath Elanchezhian [Tue, 12 Jul 2016 16:27:09 +0000 (16:27 +0000)]
Merge \\"App launch - Test app changes\\" into nyc-dev am:
8fabbb89c0
am:
2b6700a27b
Change-Id: Idb5094bfaab92982890c13dc9639ab45480acad6
TreeHugger Robot [Tue, 12 Jul 2016 16:11:41 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 12 Jul 2016 16:11:24 +0000 (16:11 +0000)]
Merge "Merge \"App launch - Test app changes\" into nyc-dev am:
8fabbb89c0" into nyc-mr1-dev
Gopinath [Tue, 12 Jul 2016 16:11:01 +0000 (16:11 +0000)]
Merge \"App launch - Test app changes\" into nyc-dev
am:
8fabbb89c0
Change-Id: I0b14fe4a4dd9414d9fe9d15980e8058a7b3d9e29
TreeHugger Robot [Tue, 12 Jul 2016 16:10:11 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Gopinath [Tue, 12 Jul 2016 16:09:18 +0000 (16:09 +0000)]
Merge \"App launch - Test app changes\" into nyc-dev
am:
8fabbb89c0
Change-Id: I304e8791b2ea72bd527fa0c8abd2c748c90e866c
Gopinath Elanchezhian [Tue, 12 Jul 2016 16:02:42 +0000 (16:02 +0000)]
Merge "App launch - Test app changes" into nyc-dev
Chris Wren [Tue, 12 Jul 2016 15:24:17 +0000 (15:24 +0000)]
Merge \"also log details for neko rename events\" into nyc-mr1-dev
am:
53f0694f9a
Change-Id: I9c0aab9e3ee0589463f76dba50309501c4963bb7
Chris Wren [Tue, 12 Jul 2016 15:16:03 +0000 (15:16 +0000)]
Merge "also log details for neko rename events" into nyc-mr1-dev
Hugo Benichi [Tue, 12 Jul 2016 13:26:15 +0000 (13:26 +0000)]
Merge \\\"Fix unsafe concurrent access in LegacyTypeTracker\\\" am:
ee4c8fb9eb am:
e82b43f77e
am:
4057d3c24e
Change-Id: I4986b4646220b9be53f8063f2d5a41a763011a96
Hugo Benichi [Tue, 12 Jul 2016 13:20:56 +0000 (13:20 +0000)]
Merge \\"Fix unsafe concurrent access in LegacyTypeTracker\\" am:
ee4c8fb9eb
am:
e82b43f77e
Change-Id: I20a3426002ebe6f4db9de7edf7c4072d0a27dbdc
Hugo Benichi [Tue, 12 Jul 2016 13:15:41 +0000 (13:15 +0000)]
Merge \"Fix unsafe concurrent access in LegacyTypeTracker\"
am:
ee4c8fb9eb
Change-Id: I928b2c6ef8e20e197425c214242287185a9daa06
Treehugger Robot [Tue, 12 Jul 2016 13:08:20 +0000 (13:08 +0000)]
Merge "Fix unsafe concurrent access in LegacyTypeTracker"
Hugo Benichi [Tue, 21 Jun 2016 00:48:07 +0000 (09:48 +0900)]
Fix unsafe concurrent access in LegacyTypeTracker
This patch adds synchronization inside LegacyTypeTracker so that
getNetworkForType() can safely run concurrently with remove().
Without synchronization if remove() removes the last network for a
given type while getNetworkForType() runs for the same type, it is
possible that getNetworkForType tries to access the head of an empty
list, resulting in a runtime exception.
This issue was found by zoran.jovanovic@sonymobile.com who proposed a
fix in AOSP (Change-Id: Ia963662edb9d643790e8d9439e4dbdcac4c2187b).
This patch differs from the fix proposed by the bug reporter and tries
instead to do the minimum amount of locking to make getNetworkForType
safe.
Bug:
29030387
(cherry picked from commit
78caa25870391f676e1edbd448b5ff3e12a99a1e)
Change-Id: I915aac527fc8828b32bf35fee870add2dfb11d8d
Mahaver Chopra [Tue, 12 Jul 2016 09:54:59 +0000 (09:54 +0000)]
Merge \"Add an api to verify if ro.device_owner was set\" into nyc-mr1-dev
am:
c1182a8128
Change-Id: I6fecc2edf4ba78d60f509679c0b9b5367305f310
Mahaver Chopra [Tue, 12 Jul 2016 09:48:00 +0000 (09:48 +0000)]
Merge "Add an api to verify if ro.device_owner was set" into nyc-mr1-dev
Bill Yi [Tue, 12 Jul 2016 06:31:19 +0000 (23:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5d623d602d07244fd92716ff53a126a6ccc299d
Auto-generated-cl: translation import
Bill Yi [Tue, 12 Jul 2016 06:19:08 +0000 (23:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie2c78f0ee8cc349517b13826856b6648bbb29461
Auto-generated-cl: translation import
Hugo Benichi [Tue, 12 Jul 2016 04:39:05 +0000 (04:39 +0000)]
ConnectivityService dump: add apps blocked logs
am:
c2ae287e73
Change-Id: I50c87dc35ef219844a5337768ec2526aeff4f1ca
Hugo Benichi [Mon, 11 Jul 2016 02:05:12 +0000 (11:05 +0900)]
ConnectivityService dump: add apps blocked logs
This patch adds NetworkInfo BLOCKED/UNBLOCKED status of apps to
ConnectivityService's dump logs.
The BLOCKED or UNBLOCKED status of an app is logged with the app uid
when the app calls getActiveNetworkInfo().
Examples:
mNetworkInfoBlockingLogs (most recent first):
07-11 11:04:43.139 - BLOCKED 10060
07-11 11:04:39.056 - UNBLOCKED 10061
07-11 11:04:38.851 - BLOCKED 10061
Bug:
29981766
Change-Id: I6e2fde446702b92b0964ed894409b5d733d8f8a7
Bert McMeen [Tue, 12 Jul 2016 01:03:44 +0000 (01:03 +0000)]
Merge \\\\"Docs: Release Notes for Dev Preview 2\\\\" into mnc-io-docs am:
b039c753f3 am:
40df51ce20 am:
3ed7666f03
am:
ee5b74770b
Change-Id: I128fcb552f13cb723d45670049609fd12074451c
Bert McMeen [Tue, 12 Jul 2016 01:01:48 +0000 (01:01 +0000)]
Merge \\\\"Docs: Release Notes for Dev Preview 2\\\\" into mnc-io-docs am:
b039c753f3 am:
40df51ce20 am:
3ed7666f03
am:
421f4d21b4
Change-Id: I5d6ad073619666748982961643501e378dee4e17
Bert McMeen [Tue, 12 Jul 2016 00:56:36 +0000 (00:56 +0000)]
Merge \\\"Docs: Release Notes for Dev Preview 2\\\" into mnc-io-docs am:
b039c753f3 am:
40df51ce20
am:
3ed7666f03
Change-Id: I63cb2c22bc88bdbe657ccde673435a32cbe2e895
Bert McMeen [Tue, 12 Jul 2016 00:56:33 +0000 (00:56 +0000)]
Merge \\\"Docs: Release Notes for Dev Preview 2\\\" into mnc-io-docs am:
b039c753f3 am:
40df51ce20
am:
3ed7666f03
Change-Id: I568f07a35d75a5e8762e9c117a4d1b02e03e9cc0
Bert McMeen [Tue, 12 Jul 2016 00:50:19 +0000 (00:50 +0000)]
Merge \\"Docs: Release Notes for Dev Preview 2\\" into mnc-io-docs am:
b039c753f3
am:
40df51ce20
Change-Id: I2d698e096a81093a8471dcd3dcf1994986c29a97
Bert McMeen [Tue, 12 Jul 2016 00:45:11 +0000 (00:45 +0000)]
Merge \"Docs: Release Notes for Dev Preview 2\" into mnc-io-docs
am:
b039c753f3
Change-Id: I39f6735f53186f6cb03036a3c7731ca06449acf1
Android Build Merger (Role) [Tue, 12 Jul 2016 00:36:56 +0000 (00:36 +0000)]
Merge "Merge \\\\"Docs: Information on OTA updates\\\\" into mnc-io-docs am:
2f297621a1 am:
1dee5f4dbe am:
d8c8d710b7 am:
8d2b729b5d" into nyc-mr1-dev-plus-aosp
Bert McMeen [Tue, 12 Jul 2016 00:36:35 +0000 (00:36 +0000)]
Merge \\\\"Docs: Information on OTA updates\\\\" into mnc-io-docs am:
2f297621a1 am:
1dee5f4dbe am:
d8c8d710b7
am:
8d2b729b5d
Change-Id: Ic8b77b4bb27b21a7ebb37ee77e6bf7238d714386
Bert McMeen [Tue, 12 Jul 2016 00:36:20 +0000 (00:36 +0000)]
Merge \\\\"Docs: Information on OTA updates\\\\" into mnc-io-docs am:
2f297621a1 am:
1dee5f4dbe am:
d8c8d710b7
am:
8e17ac6059
Change-Id: I4594f6e3d5eb52630709db2b04a983264d87b344
Bert McMeen [Tue, 12 Jul 2016 00:35:07 +0000 (00:35 +0000)]
Merge "Docs: Release Notes for Dev Preview 2" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:29:22 +0000 (00:29 +0000)]
Merge \\\"Docs: Information on OTA updates\\\" into mnc-io-docs am:
2f297621a1 am:
1dee5f4dbe
am:
d8c8d710b7
Change-Id: I6087417af1d91756b44028ef8529cfacbe606869
Bert McMeen [Tue, 12 Jul 2016 00:29:21 +0000 (00:29 +0000)]
Merge \\\"Docs: Information on OTA updates\\\" into mnc-io-docs am:
2f297621a1 am:
1dee5f4dbe
am:
d8c8d710b7
Change-Id: Id6f1de1dae8ee617518b9a8c656379d8dd93f0a0
Bert McMeen [Tue, 12 Jul 2016 00:24:17 +0000 (00:24 +0000)]
Merge \\"Docs: Information on OTA updates\\" into mnc-io-docs am:
2f297621a1
am:
1dee5f4dbe
Change-Id: Ie1685c1393e740fb7d44ef8dbb714ed408eb4319
Bert McMeen [Fri, 24 Jun 2016 21:55:12 +0000 (14:55 -0700)]
Docs: Release Notes for Dev Preview 2
Bug:
29419006
Change-Id: I24f9aa03db1150ab303fa222009f888e0e4cb01d
Bert McMeen [Tue, 12 Jul 2016 00:18:48 +0000 (00:18 +0000)]
Merge \"Docs: Information on OTA updates\" into mnc-io-docs
am:
2f297621a1
Change-Id: I766877a188e5878001da9ffe91d2f09f49e8f3ee
Bert McMeen [Tue, 12 Jul 2016 00:14:47 +0000 (00:14 +0000)]
Merge "Docs: Information on OTA updates" into mnc-io-docs
Amit Mahajan [Tue, 12 Jul 2016 00:12:53 +0000 (00:12 +0000)]
Merge \"Disable using SIM language for Chunghwa Telecom and Far EasTone.\" into nyc-mr1-dev
am:
a0f7dd6772
Change-Id: I23628b616e69d57db3432c70745417b3e7350f51
Amit Mahajan [Tue, 12 Jul 2016 00:03:08 +0000 (00:03 +0000)]
Merge "Disable using SIM language for Chunghwa Telecom and Far EasTone." into nyc-mr1-dev
Android Build Merger (Role) [Tue, 12 Jul 2016 00:01:42 +0000 (00:01 +0000)]
Merge "Merge \"Cleanup whole preloads directory\" into nyc-mr1-dev am:
243d7b3cd2" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jul 2016 00:01:26 +0000 (00:01 +0000)]
Merge "Merge \"Merge \\\\"Docs: Changed Blank Activity to Basic Activity\\\\" into mnc-io-docs am:
93dd99c6aa am:
92c664b13d am:
e9ec18cd9f\" into nyc-mr1-dev am:
f86b9b2ef4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jul 2016 00:01:12 +0000 (00:01 +0000)]
Merge "Merge \"Don\'t force fstrim on OTA\" into nyc-mr1-dev am:
bef41bf538" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 12 Jul 2016 00:01:00 +0000 (00:01 +0000)]
Merge "Merge \\\\"Docs: Replaced fill_parent with match_parent\\\\" into mnc-io-docs am:
1b72b7955d am:
202bfb4fc7 am:
79a3f25ce4 am:
c7a25a3cf2" into nyc-mr1-dev-plus-aosp
Fyodor Kupolov [Tue, 12 Jul 2016 00:00:19 +0000 (00:00 +0000)]
Merge \"Cleanup whole preloads directory\" into nyc-mr1-dev
am:
243d7b3cd2
Change-Id: Ia6a1a651733734c63fc441bc97cb6c6ca3b41850
Hemal Patel [Tue, 12 Jul 2016 00:00:16 +0000 (00:00 +0000)]
Merge \"Merge \\\\"Docs: Changed Blank Activity to Basic Activity\\\\" into mnc-io-docs am:
93dd99c6aa am:
92c664b13d am:
e9ec18cd9f\" into nyc-mr1-dev
am:
f86b9b2ef4
Change-Id: I239005ee9b4f65959bd0aabc23df132160f8b181
Christopher Tate [Tue, 12 Jul 2016 00:00:13 +0000 (00:00 +0000)]
Merge \"Don\'t force fstrim on OTA\" into nyc-mr1-dev
am:
bef41bf538
Change-Id: I44a67399d64e44e4966e891f50d1c19db84f5a70
Hemal Patel [Tue, 12 Jul 2016 00:00:09 +0000 (00:00 +0000)]
Merge \\\\"Docs: Replaced fill_parent with match_parent\\\\" into mnc-io-docs am:
1b72b7955d am:
202bfb4fc7 am:
79a3f25ce4
am:
c7a25a3cf2
Change-Id: I16224a6d6ddc8e0245c4aeab4899258da23eef2b
Hemal Patel [Tue, 12 Jul 2016 00:00:05 +0000 (00:00 +0000)]
Merge \\\\"Docs: Changed Blank Activity to Basic Activity\\\\" into mnc-io-docs am:
93dd99c6aa am:
92c664b13d am:
e9ec18cd9f
am:
872a3cd2d6
Change-Id: Icd9ce129353664054dbfa818d9de387524f361e0
Hemal Patel [Tue, 12 Jul 2016 00:00:02 +0000 (00:00 +0000)]
Merge \\\\"Docs: Replaced fill_parent with match_parent\\\\" into mnc-io-docs am:
1b72b7955d am:
202bfb4fc7 am:
79a3f25ce4
am:
c7d0c34068
Change-Id: Ieb4cd7d1bba463918c8d788699e68393e9e178f6
Vladislav Kaznacheev [Mon, 11 Jul 2016 23:53:18 +0000 (23:53 +0000)]
Merge \\"Fix docs for DragEvent\\" into nyc-dev am:
b6fa207c67
am:
78004643e1
Change-Id: I857362ef337c99547010f83ad8f4529b95da1c59
TreeHugger Robot [Mon, 11 Jul 2016 23:50:27 +0000 (23:50 +0000)]
Merge "Cleanup whole preloads directory" into nyc-mr1-dev
Hemal Patel [Mon, 11 Jul 2016 23:49:53 +0000 (23:49 +0000)]
Merge \\\"Docs: Changed Blank Activity to Basic Activity\\\" into mnc-io-docs am:
93dd99c6aa am:
92c664b13d
am:
e9ec18cd9f
Change-Id: I992e04521f93e709c6420c36ae424d37871ad2eb
Android Build Merger (Role) [Mon, 11 Jul 2016 23:45:51 +0000 (23:45 +0000)]
Merge "Merge \\\"Docs: Changed Blank Activity to Basic Activity\\\" into mnc-io-docs am:
93dd99c6aa am:
92c664b13d am:
e9ec18cd9f" into nyc-mr1-dev
Hemal Patel [Mon, 11 Jul 2016 23:45:25 +0000 (23:45 +0000)]
Merge \\\"Docs: Changed Blank Activity to Basic Activity\\\" into mnc-io-docs am:
93dd99c6aa am:
92c664b13d
am:
e9ec18cd9f
Change-Id: Idff4581451ed551bd875d493715f41d6dc922a9e
Bert McMeen [Wed, 22 Jun 2016 00:01:31 +0000 (17:01 -0700)]
Docs: Information on OTA updates
Bug:
29545156
Change-Id: I557205fe9c1990d0dbfc020e20f610dae80bbcc5
Chris Tate [Mon, 11 Jul 2016 23:43:51 +0000 (23:43 +0000)]
Merge "Don't force fstrim on OTA" into nyc-mr1-dev
Hemal Patel [Mon, 11 Jul 2016 23:37:22 +0000 (23:37 +0000)]
Merge \\\"Docs: Replaced fill_parent with match_parent\\\" into mnc-io-docs am:
1b72b7955d am:
202bfb4fc7
am:
79a3f25ce4
Change-Id: I6fb357788a646c427164d4b6996f2ca1c834b43f
Hemal Patel [Mon, 11 Jul 2016 23:36:47 +0000 (23:36 +0000)]
Merge \\\"Docs: Replaced fill_parent with match_parent\\\" into mnc-io-docs am:
1b72b7955d am:
202bfb4fc7
am:
79a3f25ce4
Change-Id: Ibac609fc851552c9930b11d74bc89c79f8ce26e8
Hemal Patel [Mon, 11 Jul 2016 23:32:21 +0000 (23:32 +0000)]
Merge \\"Docs: Changed Blank Activity to Basic Activity\\" into mnc-io-docs am:
93dd99c6aa
am:
92c664b13d
Change-Id: I52034f812994545893e6e4e8a9de9de79f593bb2
Android Build Merger (Role) [Mon, 11 Jul 2016 23:31:22 +0000 (23:31 +0000)]
Merge "Merge \"Set PrintDocumentInfo#mDataSize\" into nyc-mr1-dev am:
ba229ce88a" into nyc-mr1-dev-plus-aosp
Philip P. Moltmann [Mon, 11 Jul 2016 23:30:51 +0000 (23:30 +0000)]
Merge \"Set PrintDocumentInfo#mDataSize\" into nyc-mr1-dev
am:
ba229ce88a
Change-Id: If8a117c396ef206afaa86e9d4fad7c0dcc182a17
Vladislav Kaznacheev [Mon, 11 Jul 2016 23:30:49 +0000 (23:30 +0000)]
Merge \\"Fix docs for DragEvent\\" into nyc-dev am:
b6fa207c67
am:
879b3fb9ce
Change-Id: I93210c64927b5240622099a5715068f36d71bd57
Vladislav Kaznacheev [Mon, 11 Jul 2016 23:26:31 +0000 (23:26 +0000)]
Merge \"Fix docs for DragEvent\" into nyc-dev
am:
b6fa207c67
Change-Id: I7acfd89bb3cd51273007d8dc7b899ae6b95c7937
Hemal Patel [Mon, 11 Jul 2016 23:26:09 +0000 (23:26 +0000)]
Merge \\"Docs: Replaced fill_parent with match_parent\\" into mnc-io-docs am:
1b72b7955d
am:
202bfb4fc7
Change-Id: Ie5faab93a9c417f6191bb0855dd3ad9326f0c955
Vladislav Kaznacheev [Mon, 11 Jul 2016 23:26:05 +0000 (23:26 +0000)]
Merge \"Fix docs for DragEvent\" into nyc-dev
am:
b6fa207c67
Change-Id: I33c231d19065a5acc26472d4c3f175351d2a6d10
Hemal Patel [Mon, 11 Jul 2016 23:25:59 +0000 (23:25 +0000)]
Merge \"Docs: Changed Blank Activity to Basic Activity\" into mnc-io-docs
am:
93dd99c6aa
Change-Id: I28de4c355c23d96ab52a945bfd26567063f25212
Hemal Patel [Mon, 11 Jul 2016 23:22:47 +0000 (23:22 +0000)]
Merge "Docs: Changed Blank Activity to Basic Activity" into mnc-io-docs
Philip P. Moltmann [Mon, 11 Jul 2016 23:22:02 +0000 (23:22 +0000)]
Merge "Set PrintDocumentInfo#mDataSize" into nyc-mr1-dev
Hemal Patel [Mon, 11 Jul 2016 23:21:01 +0000 (23:21 +0000)]
Merge \"Docs: Replaced fill_parent with match_parent\" into mnc-io-docs
am:
1b72b7955d
Change-Id: I8fec574e1501e84f69d9e53b02b0a7537bd3dc16
TreeHugger Robot [Mon, 11 Jul 2016 23:17:40 +0000 (23:17 +0000)]
Merge "Fix docs for DragEvent" into nyc-dev
Hemal Patel [Mon, 11 Jul 2016 23:16:51 +0000 (23:16 +0000)]
Merge "Docs: Replaced fill_parent with match_parent" into mnc-io-docs
Hemal Patel [Fri, 24 Jun 2016 00:11:15 +0000 (17:11 -0700)]
Docs: Replaced fill_parent with match_parent
The value fill_parent is deprecated in API Level 8 and replaced
with match_parent.
Bug:
19432266
Change-Id: Ie91b4de25f1b12ec93c52531785303d683b18d24
Andrew Solovay [Mon, 11 Jul 2016 22:26:37 +0000 (22:26 +0000)]
Merge \\\\"docs: Fixing badly formatted {@code} strings\\\\" into mnc-io-docs am:
78125ff7cb am:
28528e3c62 am:
f550894eac
am:
bb6f52d06b
Change-Id: I9f6dc1d4d5d3123d1550d4dd94493252df921aa8
Andrew Solovay [Mon, 11 Jul 2016 22:21:26 +0000 (22:21 +0000)]
Merge \\\\"docs: Fixing badly formatted {@code} strings\\\\" into mnc-io-docs am:
78125ff7cb am:
28528e3c62 am:
f550894eac
am:
05e96ad3cc
Change-Id: Ic72f627ab6aa7363e003b89a008db32101f039d8
Andrew Solovay [Mon, 11 Jul 2016 22:15:40 +0000 (22:15 +0000)]
Merge \\\"docs: Fixing badly formatted {@code} strings\\\" into mnc-io-docs am:
78125ff7cb am:
28528e3c62
am:
f550894eac
Change-Id: If2ffeb50905a7e8a6205cbc643ffcbb3f0b7f44c
Tyler Gunn [Mon, 11 Jul 2016 22:09:10 +0000 (22:09 +0000)]
Merge \"Finalize MEP functionality.\" into nyc-mr1-dev
am:
768cf076da
Change-Id: Idb9702f44f93ecf46ecf86cda2adbc596bdfc52f
Andrew Solovay [Mon, 11 Jul 2016 22:08:56 +0000 (22:08 +0000)]
Merge \\\"docs: Fixing badly formatted {@code} strings\\\" into mnc-io-docs am:
78125ff7cb am:
28528e3c62
am:
f550894eac
Change-Id: I201f56304c9dadda2163b37bb40d6e64006ed98e
Hemal Patel [Fri, 1 Jul 2016 20:33:14 +0000 (13:33 -0700)]
Docs: Changed Blank Activity to Basic Activity
As per Android Studio's latest version, Blank Activity is renamed to
Basic Activity. Hence, fixed step 6 to reflect the change.
Bug:
28177899
Change-Id: I824d60f936975645cd9116e8443771b68e132af9
Andrew Solovay [Mon, 11 Jul 2016 21:58:47 +0000 (21:58 +0000)]
Merge \\"docs: Fixing badly formatted {@code} strings\\" into mnc-io-docs am:
78125ff7cb
am:
28528e3c62
Change-Id: Ie9a21623f1491983aab4cfc624818bb3b8720185
Fyodor Kupolov [Mon, 11 Jul 2016 21:58:36 +0000 (21:58 +0000)]
Merge \"Schedule backup of a package on a background thread\" into nyc-mr1-dev
am:
e31d6f76b3
Change-Id: I6cf5785ed006f2cb9c8d485cbe2bb2a9a3f29546
Tyler Gunn [Mon, 11 Jul 2016 21:53:00 +0000 (21:53 +0000)]
Merge "Finalize MEP functionality." into nyc-mr1-dev
Fyodor Kupolov [Mon, 11 Jul 2016 21:51:01 +0000 (21:51 +0000)]
Merge "Schedule backup of a package on a background thread" into nyc-mr1-dev
Andrew Solovay [Mon, 11 Jul 2016 21:48:06 +0000 (21:48 +0000)]
Merge \"docs: Fixing badly formatted {@code} strings\" into mnc-io-docs
am:
78125ff7cb
Change-Id: Id68f9e49225f59e8cb94bcd7ab3905790dc2d223
Android Build Merger (Role) [Mon, 11 Jul 2016 21:43:14 +0000 (21:43 +0000)]
Merge "Merge \\\\"docs: Adding Android TV App Link docs\\\\" into mnc-io-docs am:
e0b687048f am:
68ef31fc36 am:
7579d70ca1 am:
ce960c39a4" into nyc-mr1-dev-plus-aosp
Dan Yu [Mon, 11 Jul 2016 21:42:54 +0000 (21:42 +0000)]
Merge \\\\"docs: Adding Android TV App Link docs\\\\" into mnc-io-docs am:
e0b687048f am:
68ef31fc36 am:
7579d70ca1
am:
ce960c39a4
Change-Id: I141a1c9b0040a974e76cf4623b3267bd8eab6e8a
Daniel Yu [Mon, 11 Jul 2016 21:40:36 +0000 (21:40 +0000)]
Merge \"Merge \\\\"docs: Adding Android TV App Link docs\\\\" into mnc-io-docs am:
e0b687048f am:
68ef31fc36 am:
7579d70ca1\" into nyc-mr1-dev
am:
ce7ac9a0d2
Change-Id: If65c82fab0d34dd833c6421b6fee9e02d7a6535a
Bert McMeen [Mon, 11 Jul 2016 21:40:32 +0000 (21:40 +0000)]
Merge \"Merge \\\\"Docs: Gestures docs\\\\" into mnc-io-docs am:
b7b9aa1a51 am:
1639959f3b am:
58b4f0d535\" into nyc-mr1-dev
am:
6496b6e369
Change-Id: I475feb880dba77d4eba6930d8534fe73e084c5c5
Fyodor Kupolov [Mon, 11 Jul 2016 21:40:29 +0000 (14:40 -0700)]
Cleanup whole preloads directory
When leaving SUW, cleanup preloads directory, not just demo dir.
Bug:
29908713
Change-Id: Id94e6df619f5ca6585b2a0edb0f1028364431f95
sreevanis [Mon, 11 Jul 2016 21:40:29 +0000 (21:40 +0000)]
Merge \"Merge \\\\"docs: Updated Create custom drawer view section with new xml attributes.\\\\" into mnc-io-docs am:
9f1952a77b am:
ced99e1199 am:
fe7b26e229\" into nyc-mr1-dev
am:
a539e5b612
Change-Id: Idc6a36db52db5d5bad1eabe1e0a61e0cb7436268
Andrew Solovay [Mon, 11 Jul 2016 21:40:26 +0000 (21:40 +0000)]
Merge "docs: Fixing badly formatted {@code} strings" into mnc-io-docs
Makoto Onuki [Mon, 11 Jul 2016 21:40:25 +0000 (21:40 +0000)]
Merge \"Handle package broadcasts before apps do\" into nyc-mr1-dev
am:
ae13eee9c6
Change-Id: I4eee7d585bfe1218fae425f2b3f2097965924587
Bert McMeen [Mon, 11 Jul 2016 21:35:43 +0000 (21:35 +0000)]
Merge \\\\"Docs: Gestures docs\\\\" into mnc-io-docs am:
b7b9aa1a51 am:
1639959f3b am:
58b4f0d535
am:
863ddc3541
Change-Id: I4c1a9d4db73795ac765112742761fa1984bfea14
Bert McMeen [Mon, 11 Jul 2016 21:35:41 +0000 (21:35 +0000)]
Merge \\\\"docs: Updated Create custom drawer view section with new xml attributes.\\\\" into mnc-io-docs am:
9f1952a77b am:
ced99e1199 am:
fe7b26e229
am:
bd5712ab78
Change-Id: If661d7242a1d4df8abeb9d09ea1ec0e4083d00f1
Daniel Yu [Mon, 11 Jul 2016 21:34:59 +0000 (21:34 +0000)]
Merge \\\"docs: Adding Android TV App Link docs\\\" into mnc-io-docs am:
e0b687048f am:
68ef31fc36
am:
7579d70ca1
Change-Id: I44055a254be6be3cb938ef1c73108036b0ab79a7
Jeff Sharkey [Mon, 11 Jul 2016 21:34:05 +0000 (21:34 +0000)]
Merge \"Revert \"Treat everyone the same.\"\" into nyc-mr1-dev
am:
9dbc259b4f
Change-Id: Idbddd94cb16c2dee3891bcff14ceb618793dd767
OSDN Git Service
