Commit Graph

254309 Commits

Author SHA1 Message Date
Bill Yi
4fb97691f1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 6856972e4b  -s ours

Change-Id: I0071654ea2d70605ea858e19454621f97fd92f28
2016-09-22 12:29:55 +00:00
Bill Yi
3dc3d3eda4 Import translations. DO NOT MERGE
am: 7060296d02  -s ours

Change-Id: Iece9d5abf1ddb194f6009640ad6626609a8d769e
2016-09-22 12:29:51 +00:00
Bill Yi
7640ef24d1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: d5d5dc2473  -s ours

Change-Id: Ie1fd61e17f3ed2a1429412722f1571e5c1e91954
2016-09-22 10:22:21 +00:00
Bill Yi
660e6d0269 Import translations. DO NOT MERGE
am: 6394011a86  -s ours

Change-Id: I5b6ba4829095eed2641781e45468a1f7a009ec85
2016-09-22 10:22:17 +00:00
TreeHugger Robot
5086fe2800 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-22 09:56:57 +00:00
TreeHugger Robot
c051914a46 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-22 09:56:33 +00:00
TreeHugger Robot
6856972e4b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-22 09:54:12 +00:00
TreeHugger Robot
d5d5dc2473 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-22 09:52:00 +00:00
Elliot Waite
99e8284514 Merge "Revert fixed at links." into nyc-dev am: c77b72f244 am: 8ea167bf7a
am: ffb31e9954

Change-Id: I6e4932469886f810162460c5de855c46d2f2fb2b
2016-09-22 09:14:10 +00:00
Elliot Waite
47b11423ac Revert fixed at links. am: 7c70fed347 am: 4a60ffd518
am: e2b498241a

Change-Id: I0f40cd7bdc31dcf0f3865f3ff70a9e8012aedfbc
2016-09-22 09:13:23 +00:00
Adarsh Fernando
9fc1b4c5b8 Found a couple of more references to Android N. am: 9af57aa309 am: 9a91d6662e
am: acb068a213

Change-Id: I008c015bfb6c934edb55a6ece40ba3237945f66b
2016-09-22 09:12:28 +00:00
Adarsh Fernando
a7de0e1f58 Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am: fe060d3f37 am: 453160c39d
am: 551d5d7f7f

Change-Id: I1b4ae3746ec944b013cafb4635d023016d656ce3
2016-09-22 08:05:56 +00:00
Adarsh Fernando
4fb36b0dfb Docs: Cleanup of Preview language in Android 7.0 docs. am: 4b6d939321 am: 0b8e646225
am: 059c09784d

Change-Id: Ice0f6182bf2db6c8d62fc592f65834d4d9adb794
2016-09-22 08:04:57 +00:00
Stuart Scott
a177302cd0 Merge "Continue if package is not in system" into nyc-dr1-dev am: cffe1f48d3
am: a676b157fb

Change-Id: Ib06a5e2be884bac724b3d29d327acd8b0533978a
2016-09-22 08:03:52 +00:00
Stuart Scott
b15c45a037 Continue if package is not in system am: 434c8db80f
am: 0845b025aa

Change-Id: Id87f7ab2c549d176d82fbcf18479671320a74616
2016-09-22 08:03:03 +00:00
Jaewan Kim
1f52dcc543 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am: 8ba2549592 am: 60d2af330b
am: 345d75bf88

Change-Id: I38af1702ae0d2766ef15192eb53b35d88849bbf1
2016-09-22 08:02:10 +00:00
Jaewan Kim
407e4eaa34 DO NOT MERGE Check caller for sending media key to global priority session am: 09c3df004b am: 01796f794d
am: e13dc68953

Change-Id: I525e467ab112abfcd8bf9ef3e6cdc6b4b3f2f78f
2016-09-22 08:01:22 +00:00
Elliot Waite
ffb31e9954 Merge "Revert fixed at links." into nyc-dev am: c77b72f244
am: 8ea167bf7a

Change-Id: I340bb9df7c736f1c4f22c53cf8919d36f024c32e
2016-09-22 06:46:29 +00:00
Elliot Waite
e2b498241a Revert fixed at links. am: 7c70fed347
am: 4a60ffd518

Change-Id: I24d872329e40cea924da713ec3c4f869ab012824
2016-09-22 06:45:29 +00:00
Adarsh Fernando
acb068a213 Found a couple of more references to Android N. am: 9af57aa309
am: 9a91d6662e

Change-Id: I82ea73e071445ca4d07602fa54ba1f03f57635b3
2016-09-22 06:44:43 +00:00
Adarsh Fernando
551d5d7f7f Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am: fe060d3f37
am: 453160c39d

Change-Id: I5ca41ea38bfc46ed81d9319f7ce20da7e6399e0d
2016-09-22 06:43:57 +00:00
Adarsh Fernando
059c09784d Docs: Cleanup of Preview language in Android 7.0 docs. am: 4b6d939321
am: 0b8e646225

Change-Id: If303eafb66a971de300758af21a5a830084d0aff
2016-09-22 06:43:14 +00:00
Stuart Scott
a676b157fb Merge "Continue if package is not in system" into nyc-dr1-dev
am: cffe1f48d3

Change-Id: I490c87e5e70059406d3088b3ab8537bd6e42b38c
2016-09-22 06:41:55 +00:00
Stuart Scott
0845b025aa Continue if package is not in system
am: 434c8db80f

Change-Id: Ie2a9741583bb09ddcb27e28e18f29d63f371c8ff
2016-09-22 06:41:52 +00:00
Jaewan Kim
345d75bf88 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am: 8ba2549592
am: 60d2af330b

Change-Id: I1a234ee41fc85cbe954990d13b5de123efe9afc8
2016-09-22 06:41:02 +00:00
Jaewan Kim
e13dc68953 DO NOT MERGE Check caller for sending media key to global priority session am: 09c3df004b
am: 01796f794d

Change-Id: Ifdeb43d20983d31713defaae3d7e0075a11cb562
2016-09-22 06:40:10 +00:00
Bill Yi
6394011a86 Import translations. DO NOT MERGE
Change-Id: Ib207a07629651b14f450065e8314b2d8b3252c35
Auto-generated-cl: translation import
2016-09-21 23:05:36 -07:00
Bill Yi
7060296d02 Import translations. DO NOT MERGE
Change-Id: I55e1719cddf0d684ff7b5c89f11a1d0c6bb49a97
Auto-generated-cl: translation import
2016-09-21 22:35:25 -07:00
Adam Lesinski
de3ac160b0 Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev
am: 8dcd08ed04

Change-Id: I78f9e151ec1705b65f6ed512973c63dcd826fec2
2016-09-22 04:55:17 +00:00
Adam Lesinski
7f56759cfd AAPT: Don't imply specific location hardware for dump badging
am: 43158773b4

Change-Id: Ie34566a33dfbaf92f4a47f36be6786157d504066
2016-09-22 04:55:13 +00:00
Andrii Kulian
ae53cef574 Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev
am: 3904e1bc34

Change-Id: I3de16803747f58fba71d6e33ea934eb309d2310b
2016-09-22 03:54:13 +00:00
Andrii Kulian
273acdcefa Fix stopping activity when removed from waiting visible
am: ee05681139

Change-Id: Iefa95af94e488fbd33c567e268ab7fb7a1e09f51
2016-09-22 03:54:10 +00:00
Adam Powell
4a8e154109 Merge "Don't hold old host callback for fragments on the back stack" into nyc-mr1-dev
am: 33c9713bdd

Change-Id: I5b567de888a3f0ff359a1cbe7664dcced217fa62
2016-09-22 03:52:39 +00:00
Adam Powell
5254ef7bd3 Don't hold old host callback for fragments on the back stack
am: 180202f221

Change-Id: I7f2c4c8d340b1b54d3e9ded5819e19fa3e4bc83e
2016-09-22 03:52:35 +00:00
Jeff Sharkey
21c246b726 Merge "Rename should behave like create: avoid conflict." into nyc-mr1-dev
am: b90ae85acc

Change-Id: I7d6c0180ddcd9224a7e738351c7c7854f6c5068d
2016-09-22 03:51:22 +00:00
Jeff Sharkey
0e033491ca Rename should behave like create: avoid conflict.
am: 2c89a4c170

Change-Id: I8d288a8afd06bc46d8d3051ce025c0af6c9875fa
2016-09-22 03:51:19 +00:00
Edward Savage-Jones
37298f15a9 Merge "Fix WallpaperManager APIs" into nyc-mr1-dev
am: 7baf677ded

Change-Id: I0bfa8d50d88b09316c6efe8d8db16686ce0d300d
2016-09-22 03:50:15 +00:00
Edward Savage-Jones
50fe2c4847 Fix WallpaperManager APIs
am: 6009d9db88

Change-Id: I82de1e6403306f0984d15db8448546aebf7ec107
2016-09-22 03:50:04 +00:00
Elliot Waite
8ea167bf7a Merge "Revert fixed at links." into nyc-dev
am: c77b72f244

Change-Id: I2ee03bed08613ad562cd62fdae1c1bc526c10be4
2016-09-22 03:49:12 +00:00
Elliot Waite
4a60ffd518 Revert fixed at links.
am: 7c70fed347

Change-Id: I69a15936193917911224af7f417b16d30dd8dfe4
2016-09-22 03:49:08 +00:00
Selim Cinek
cbd3c73f6e Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev
am: 4c1c7f3e18

Change-Id: I74fe8ee556cf39459e61876dccab10140e3afe04
2016-09-22 03:48:38 +00:00
Selim Cinek
d4b03c47b5 Large icons now scale nicer when expanding bundles
am: 8a71ad032f

Change-Id: I391f56cca21177179ea033d7be08f649e7b61664
2016-09-22 03:48:34 +00:00
Adarsh Fernando
9a91d6662e Found a couple of more references to Android N.
am: 9af57aa309

Change-Id: I2a72b761fdb8fddbda7aca792a08c851595b29ac
2016-09-22 03:48:21 +00:00
Adarsh Fernando
453160c39d Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
am: fe060d3f37

Change-Id: I4c7c2363cea058a1b905b07826ffba5a4439f833
2016-09-22 03:47:02 +00:00
Adarsh Fernando
0b8e646225 Docs: Cleanup of Preview language in Android 7.0 docs.
am: 4b6d939321

Change-Id: Ife2fba8fa61083ccaf2c3f4a3df88418bd0a316b
2016-09-22 03:46:55 +00:00
TreeHugger Robot
8dcd08ed04 Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev 2016-09-22 02:32:57 +00:00
Elliot Waite
c77b72f244 Merge "Revert fixed at links." into nyc-dev 2016-09-22 02:19:44 +00:00
TreeHugger Robot
3904e1bc34 Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev 2016-09-22 02:01:01 +00:00
Adam Lesinski
43158773b4 AAPT: Don't imply specific location hardware for dump badging
Permissions such as android.permission.ACCESS_FINE_LOCATION
and android.permission.ACCESS_COARSE_LOCATION assumed the underlying feature
technology and aapt dump badging would emit an implied feature.

This is no longer accurate, so the only implied feature is on the general
android.hardware.location when the target SDK of the app is 21+.

Bug:25218770
Change-Id: Ica9ebf7d4f360b137af54a8c8fd6c0358cd9be6a
2016-09-21 17:52:58 -07:00
TreeHugger Robot
33c9713bdd Merge "Don't hold old host callback for fragments on the back stack" into nyc-mr1-dev 2016-09-22 00:50:00 +00:00