OSDN Git Service
Hemal Patel [Fri, 14 Oct 2016 22:20:35 +0000 (22:20 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev am:
5b2493a655 am:
52b9db5a82
am:
109e738292
Change-Id: Ief4bd204f415c043afc571cde50e997596d729b8
Hemal Patel [Fri, 14 Oct 2016 22:18:33 +0000 (22:18 +0000)]
Docs: Fixed the menu navigation instructions am:
c29dac71c0 am:
c2a22f3b41
am:
f055b640eb
Change-Id: I66254d562342d878af0ef1e4435bb4c211e9757f
Hemal Patel [Fri, 14 Oct 2016 22:11:42 +0000 (22:11 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev am:
5b2493a655
am:
52b9db5a82
Change-Id: I9e7093c33b8409f88ba5a9319a417c2e89fc7342
Hemal Patel [Fri, 14 Oct 2016 22:10:34 +0000 (22:10 +0000)]
Docs: Fixed the menu navigation instructions am:
c29dac71c0
am:
c2a22f3b41
Change-Id: Ic96f48238e790f925caf7d666681d865deeacf11
Hemal Patel [Fri, 14 Oct 2016 22:02:15 +0000 (22:02 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev
am:
5b2493a655
Change-Id: I7fdb0dabb7f530c71e4331261fbac874eea36da9
Hemal Patel [Fri, 14 Oct 2016 22:02:10 +0000 (22:02 +0000)]
Docs: Fixed the menu navigation instructions
am:
c29dac71c0
Change-Id: I0f22649ba3c4dbbca06e5d5087d6fde6737a8467
Hemal Patel [Fri, 14 Oct 2016 21:52:44 +0000 (21:52 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev
Jason Monk [Fri, 14 Oct 2016 19:00:46 +0000 (19:00 +0000)]
Fix launching alarm pending intent am:
d0408f0028 am:
9042736ff1
am:
6aa197116e
Change-Id: Ide52a40383e181a07ec24ce4d89d5368a69c635d
Jason Monk [Fri, 14 Oct 2016 18:54:00 +0000 (18:54 +0000)]
Fix launching alarm pending intent am:
d0408f0028
am:
9042736ff1
Change-Id: Id2c2ccf79c62c5e0e498259a2b88e44cb98a70b3
Jason Monk [Fri, 14 Oct 2016 18:46:44 +0000 (18:46 +0000)]
Fix launching alarm pending intent
am:
d0408f0028
Change-Id: I01f3963617638bf8c1cb8efccf027dd8a9084517
Jason Monk [Fri, 14 Oct 2016 14:46:37 +0000 (10:46 -0400)]
Fix launching alarm pending intent
Launch it as a pending intent.
Change-Id: I2adf9347facb9c6fb58cbf8549233c34fcc87350
Fixes:
23909438
Jakub Adámek [Fri, 14 Oct 2016 15:06:43 +0000 (15:06 +0000)]
Merge "Adding customizable background color support for watch." into cw-f-dev
Bill Yi [Fri, 14 Oct 2016 09:18:04 +0000 (09:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
dc7280fe74 -s ours
Change-Id: Id76b78032b01aed87ff6b203d44c09324aefea62
Bill Yi [Fri, 14 Oct 2016 09:18:02 +0000 (09:18 +0000)]
Import translations. DO NOT MERGE
am:
ade9e011a8 -s ours
Change-Id: Iee7cdf3066efea6cb75c40b908117ddeb19d1b52
TreeHugger Robot [Fri, 14 Oct 2016 09:12:50 +0000 (09:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 14 Oct 2016 09:11:06 +0000 (09:11 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e3c1d48dc0 -s ours" into cw-f-dev
Android Build Merger (Role) [Fri, 14 Oct 2016 09:10:47 +0000 (09:10 +0000)]
Merge "Import translations. DO NOT MERGE am:
cda884446e -s ours" into cw-f-dev
Bill Yi [Fri, 14 Oct 2016 09:10:07 +0000 (09:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
e3c1d48dc0 -s ours
Change-Id: Ia3d8d98b07f606740644edf3b02f69be93d18a68
Bill Yi [Fri, 14 Oct 2016 09:10:05 +0000 (09:10 +0000)]
Import translations. DO NOT MERGE
am:
cda884446e -s ours
Change-Id: I2365ca83a9522ca86d85f4dbc1c51c2350d8a6f6
Android Build Merger (Role) [Fri, 14 Oct 2016 09:09:46 +0000 (09:09 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a2dabae9dd -s ours" into cw-f-dev
Android Build Merger (Role) [Fri, 14 Oct 2016 09:09:26 +0000 (09:09 +0000)]
Merge "Import translations. DO NOT MERGE am:
3e8a8c97bb -s ours" into cw-f-dev
TreeHugger Robot [Fri, 14 Oct 2016 09:08:52 +0000 (09:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 14 Oct 2016 09:08:46 +0000 (09:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
a2dabae9dd -s ours
Change-Id: I18f9aec026325e0ee42f9a8b228a6f235a9050b3
Bill Yi [Fri, 14 Oct 2016 09:08:44 +0000 (09:08 +0000)]
Import translations. DO NOT MERGE
am:
3e8a8c97bb -s ours
Change-Id: I55e6b60d44c99e47783526de2176bbd7c9929b47
TreeHugger Robot [Fri, 14 Oct 2016 09:08:31 +0000 (09:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 14 Oct 2016 09:04:59 +0000 (09:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 14 Oct 2016 09:04:08 +0000 (09:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jakub Adamek [Fri, 14 Oct 2016 08:13:39 +0000 (09:13 +0100)]
Adding customizable background color support for watch.
values-watch/themes.xml changes some Material themes, e.g.
Dialog inherits from Dark rather than Light. Hence I have moved
all of the theme modifications into
values-watch/themes_device_defaults.xml as they wouldn't be the same
for phones.
Tested: Manually on watch and on angler. Ran CTS host side theme
tests on cw-f-dev, all passed.
cts-tf > run cts -m CtsThemeHostTestCases
Bug:
31459804
Change-Id: I74a8502469cc76ac27a471c0bf18b22fd57f5418
Bill Yi [Fri, 14 Oct 2016 06:17:12 +0000 (23:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76af7719d843ed75ebd7952186ea2a38e58195b9
Auto-generated-cl: translation import
Bill Yi [Fri, 14 Oct 2016 06:06:12 +0000 (23:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8ce479a4a98e715a350930a515acd543c59a71e
Auto-generated-cl: translation import
Bill Yi [Fri, 14 Oct 2016 00:51:03 +0000 (17:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I689e8eaf2bc621bc2a15faca830ff052e76c29e1
Auto-generated-cl: translation import
Bill Yi [Fri, 14 Oct 2016 00:42:34 +0000 (17:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3a29facc38c4e3f02dd9c0c597b936e68a135bb0
Auto-generated-cl: translation import
Garfield Tan [Fri, 14 Oct 2016 00:05:36 +0000 (00:05 +0000)]
Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev
am:
8a032b98fe
Change-Id: I22661618ad5516f264ce8e478583f46a296bd3ef
Garfield Tan [Fri, 14 Oct 2016 00:05:32 +0000 (00:05 +0000)]
DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails.
am:
d91dd17f36
Change-Id: Ia7400ff8e4ecfd903a6ff7f5158786d3fd8c1bff
TreeHugger Robot [Fri, 14 Oct 2016 00:02:31 +0000 (00:02 +0000)]
Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev
Ben Lin [Thu, 13 Oct 2016 23:51:36 +0000 (23:51 +0000)]
Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev
am:
c8358bfe65
Change-Id: Ic4ba062d30bacfc4ee7ab1ff77e44caab30c6eb4
Ben Lin [Thu, 13 Oct 2016 23:51:33 +0000 (23:51 +0000)]
Removing a mimeIcon specific for album folders from MediaProvider.
am:
6d33357882
Change-Id: I07ec7d315c510a5c3bb289a7fa2f6bb8100ebee8
Ben Lin [Thu, 13 Oct 2016 23:45:27 +0000 (23:45 +0000)]
Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev
Sungsoo [Thu, 13 Oct 2016 22:57:58 +0000 (22:57 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours am:
279ebd7ffd am:
7598d6ac9f am:
30404396be am:
d7475b491d -s ours am:
3069b72d76 am:
1fa97872ec
am:
a123773c9c
Change-Id: I992c1e69a284c35d471e2b7c8f566f0d1e377736
Michal Karpinski [Thu, 13 Oct 2016 22:52:41 +0000 (22:52 +0000)]
Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
am:
a6b3caf58e
Change-Id: I9763e78b50a98dcf1139cdc299a8944e94c824d9
Michal Karpinski [Thu, 13 Oct 2016 22:52:38 +0000 (22:52 +0000)]
Don't expose default strong auth timeout as constant
am:
6dbf67fc48
Change-Id: Iacbe9a2de7024e29e9c2c98594ebca828b855a43
Sungsoo [Thu, 13 Oct 2016 22:49:46 +0000 (22:49 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours am:
279ebd7ffd am:
7598d6ac9f am:
30404396be am:
d7475b491d -s ours am:
3069b72d76
am:
1fa97872ec
Change-Id: Icd3b420b2a0821e621c5c471859fd8bce50c557f
TreeHugger Robot [Thu, 13 Oct 2016 22:47:27 +0000 (22:47 +0000)]
Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
Sungsoo [Thu, 13 Oct 2016 22:45:14 +0000 (22:45 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours am:
279ebd7ffd am:
7598d6ac9f am:
30404396be am:
d7475b491d -s ours
am:
3069b72d76
Change-Id: If2814b43999d769e202447a5de4cff22af274b34
Sungsoo [Thu, 13 Oct 2016 22:40:33 +0000 (22:40 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours am:
279ebd7ffd am:
7598d6ac9f am:
30404396be
am:
d7475b491d -s ours
Change-Id: I2b29c3d4e9675fcae86d4c9654d7e282fbc8c13d
Sungsoo [Thu, 13 Oct 2016 22:40:27 +0000 (22:40 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours am:
03593fe78f am:
ad11872ded am:
d3f3729a17 am:
9d675aadf1 -s ours am:
3ab3eff7c1 am:
8d73b75c07
am:
790d332659
Change-Id: I67639fbbcf420f9ab873225387f61254b53fcbca
Sungsoo [Thu, 13 Oct 2016 22:35:59 +0000 (22:35 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours am:
03593fe78f am:
ad11872ded am:
d3f3729a17 am:
9d675aadf1 -s ours am:
3ab3eff7c1
am:
8d73b75c07
Change-Id: I273132962ccfe12384787f2f5bb11dbab43aeee0
Sungsoo [Thu, 13 Oct 2016 22:35:56 +0000 (22:35 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours am:
279ebd7ffd am:
7598d6ac9f
am:
30404396be
Change-Id: I31e6e3b5b6ab06e7c6025fb5be054a21d38c8477
Sungsoo [Thu, 13 Oct 2016 22:33:57 +0000 (22:33 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours am:
8b764f10c3 am:
29273190f1 am:
7bb855a973 am:
68469a695e -s ours am:
b4fdad2b8c am:
2dc905eb4d
am:
4dabb1d8bb
Change-Id: I1c180bcfc9bdd8e09518f8ac33b371829657580a
Sungsoo [Thu, 13 Oct 2016 22:31:14 +0000 (22:31 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours am:
03593fe78f am:
ad11872ded am:
d3f3729a17 am:
9d675aadf1 -s ours
am:
3ab3eff7c1
Change-Id: I2f9a8960c77f3dfdb393c76f7d8d17647d617000
Sungsoo [Thu, 13 Oct 2016 22:30:59 +0000 (22:30 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours am:
279ebd7ffd
am:
7598d6ac9f
Change-Id: I2402e57fc71128787e9b6895cb8f739b68703569
Sungsoo [Thu, 13 Oct 2016 22:29:29 +0000 (22:29 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours am:
8b764f10c3 am:
29273190f1 am:
7bb855a973 am:
68469a695e -s ours am:
b4fdad2b8c
am:
2dc905eb4d
Change-Id: I6703dc3e913257bfcccc48970744616dfac45871
Sungsoo [Thu, 13 Oct 2016 22:27:26 +0000 (22:27 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
7ce9243087 am:
bb800841ca am:
016c5889bc am:
d6508621fc -s ours am:
b576f816c5 am:
db77b50424
am:
81fac8a618
Change-Id: Id08e5d7ebfeabd632bcf5d19c97e82ad0031c16e
Sungsoo [Thu, 13 Oct 2016 22:27:00 +0000 (22:27 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours am:
03593fe78f am:
ad11872ded am:
d3f3729a17
am:
9d675aadf1 -s ours
Change-Id: Ie718673c80156edc6e205ba5e0e68ea785b1e20c
Sungsoo [Thu, 13 Oct 2016 22:26:57 +0000 (22:26 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours
am:
279ebd7ffd
Change-Id: I7acd29458a3592cc7895521036d85950afba8e64
Sungsoo [Thu, 13 Oct 2016 22:25:12 +0000 (22:25 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours am:
8b764f10c3 am:
29273190f1 am:
7bb855a973 am:
68469a695e -s ours
am:
b4fdad2b8c
Change-Id: Ic2dfe876cfa1fcf2f8b3480a6810eb4c54db8401
Sungsoo [Thu, 13 Oct 2016 22:22:59 +0000 (22:22 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
7ce9243087 am:
bb800841ca am:
016c5889bc am:
d6508621fc -s ours am:
b576f816c5
am:
db77b50424
Change-Id: Id44780752d3feb22bfc3c10b35ffabcc601da1fa
Sungsoo [Thu, 13 Oct 2016 22:22:53 +0000 (22:22 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1
am:
2179b54c9c -s ours
Change-Id: I93f44a4deb665e4e5f8695fbc3b3e3a471260c28
Sungsoo [Thu, 13 Oct 2016 22:22:51 +0000 (22:22 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours am:
03593fe78f am:
ad11872ded
am:
d3f3729a17
Change-Id: I37bdd65d9b241234190f42b927ef4f1ba796490e
Sungsoo [Thu, 13 Oct 2016 22:20:35 +0000 (22:20 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours am:
8b764f10c3 am:
29273190f1 am:
7bb855a973
am:
68469a695e -s ours
Change-Id: I46494f3d01d4d3888c712d066a8a8658f7dd872d
Sungsoo [Thu, 13 Oct 2016 22:18:44 +0000 (22:18 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
7ce9243087 am:
bb800841ca am:
016c5889bc am:
d6508621fc -s ours
am:
b576f816c5
Change-Id: I8343fb9ee7f33ccbb6b9a0dfc143da95c18b6d08
Sungsoo [Thu, 13 Oct 2016 22:18:36 +0000 (22:18 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours
am:
a8d06257c1
Change-Id: I5f25f766a472bfddc32aa7ab7e506bc5e5d6854b
Sungsoo [Thu, 13 Oct 2016 22:18:29 +0000 (22:18 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours am:
03593fe78f
am:
ad11872ded
Change-Id: Iaf3dd04a8ee9816d00aa932386adf0601ca43360
Sungsoo [Thu, 13 Oct 2016 22:16:57 +0000 (22:16 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours am:
8b764f10c3 am:
29273190f1
am:
7bb855a973
Change-Id: I0a8abff7747224ab05012b908024bbfeda354f9c
Sungsoo Lim [Thu, 13 Oct 2016 22:13:01 +0000 (22:13 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev am:
e29077105e am:
9dd9c5a856
am:
5554e0ac16
Change-Id: Ie6b60e245d20b586ee4aeb4549d603c85d6457ee
Sungsoo [Thu, 13 Oct 2016 22:12:07 +0000 (22:12 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
7ce9243087 am:
bb800841ca am:
016c5889bc
am:
d6508621fc -s ours
Change-Id: Ie77ff477549bbba05151fa3909ba5be26f91e05b
Sungsoo [Thu, 13 Oct 2016 22:12:03 +0000 (22:12 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours
am:
2a762996cb -s ours
Change-Id: If32418debc774a2f78eae4cc2b3f5b77457bfa1c
Sungsoo [Thu, 13 Oct 2016 22:11:59 +0000 (22:11 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours am:
8b764f10c3
am:
29273190f1
Change-Id: I8ebc69bc574bdeece4b3f79e36651dfb9965f7a2
Sungsoo [Thu, 13 Oct 2016 22:11:58 +0000 (22:11 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours
am:
03593fe78f
Change-Id: I4e8fb688d568354c7cd53efc170e7e0611862095
Sungsoo [Thu, 13 Oct 2016 22:11:58 +0000 (22:11 +0000)]
ExifInterface: Provide backward compatibility am:
2dbe166801 am:
bc813cd510
am:
36f64a2f0c
Change-Id: Ibc82a2ddd80dff7d98880db0a179fbb1540ac6f8
Sungsoo [Thu, 13 Oct 2016 22:07:20 +0000 (22:07 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
7ce9243087 am:
bb800841ca
am:
016c5889bc
Change-Id: I03faa540856ba74aff431e287cecc5995b6037bd
Sungsoo Lim [Thu, 13 Oct 2016 22:06:46 +0000 (22:06 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev am:
e29077105e
am:
9dd9c5a856
Change-Id: I293992f615763762ee6d403a5548d873e4891271
Sungsoo [Thu, 13 Oct 2016 22:06:09 +0000 (22:06 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours
am:
8b764f10c3
Change-Id: I8bfb9d9be23485f02d808df21c6ddfaed6d0d2b2
Sungsoo [Thu, 13 Oct 2016 22:06:03 +0000 (22:06 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd
am:
68aa33b9bf -s ours
Change-Id: I7fe3d5dbcb7bd206233ce969840f5ed182913dd6
Sungsoo [Thu, 13 Oct 2016 22:06:01 +0000 (22:06 +0000)]
ExifInterface: Provide backward compatibility am:
2dbe166801
am:
bc813cd510
Change-Id: I0aa6d33baeec8dd991561d964bfce16915c0553d
Sungsoo [Thu, 13 Oct 2016 22:06:00 +0000 (22:06 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559
am:
2816a5fa5e -s ours
Change-Id: I51df5f3d8e79c31f6c299fdbeec3fbfb9d9a300e
Sungsoo [Thu, 13 Oct 2016 22:01:39 +0000 (22:01 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f
am:
29e643bcbd
Change-Id: I413ba35abfc8999c405df78a40b8182f19472b6a
Sungsoo [Thu, 13 Oct 2016 22:01:22 +0000 (22:01 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
7ce9243087
am:
bb800841ca
Change-Id: I93674ad50daa5c3b7411a87112ad33ce199e71ce
Sungsoo [Thu, 13 Oct 2016 22:00:51 +0000 (22:00 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours
am:
3992742559
Change-Id: I0b7cbc29fa69ff1170e377bd51621c5a5e14f793
Sungsoo [Thu, 13 Oct 2016 21:59:28 +0000 (21:59 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3
am:
11b522b40f -s ours
Change-Id: I144aee71338030bd8db42cc8ba8c12976e371762
Bill Yi [Thu, 13 Oct 2016 21:58:39 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I825794cb543e17e2a5d2444c15a1dfdbdb048e23
Auto-generated-cl: translation import
Sungsoo Lim [Thu, 13 Oct 2016 21:57:26 +0000 (21:57 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev
am:
e29077105e
Change-Id: I1591f2c41214c14bb85ea90d59e94a44dafe8a77
Sungsoo [Thu, 13 Oct 2016 21:57:22 +0000 (21:57 +0000)]
ExifInterface: Provide backward compatibility
am:
2dbe166801
Change-Id: I53f2bfb056d955c6693cb65c9cb9a21859ff7535
Sungsoo [Thu, 13 Oct 2016 21:57:01 +0000 (21:57 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am:
22bd36448e -s ours
Change-Id: I13a49444b80cd07c0cb37f6b8fb514b5b04e61bb
Sungsoo [Thu, 13 Oct 2016 21:56:56 +0000 (21:56 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am:
c11f599a2f
Change-Id: If503e3361e69ad88a166f145603273d728d65652
Sungsoo [Thu, 13 Oct 2016 21:56:55 +0000 (21:56 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am:
7ce9243087
Change-Id: I3d46cccc578160d7da5ff81e0caa09a52a17e9eb
Sungsoo [Thu, 13 Oct 2016 21:54:25 +0000 (21:54 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am:
87a9ac70c3
Change-Id: I6639c6763ee1f7d83d03cc6d5fa11cbf1516e7cc
Sungsoo Lim [Thu, 13 Oct 2016 21:46:38 +0000 (21:46 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev
Christopher Tate [Thu, 13 Oct 2016 21:13:03 +0000 (21:13 +0000)]
Merge "Only full-data back up regular files + directories" into nyc-mr1-dev
am:
b3ca7c26e1
Change-Id: I363cf717193316eaa9ad910284bb3140c6684dbc
Christopher Tate [Thu, 13 Oct 2016 21:13:00 +0000 (21:13 +0000)]
Only full-data back up regular files + directories
am:
da2018efeb
Change-Id: I6ecc74ee9613f221e24acca571560bf8190b7073
TreeHugger Robot [Thu, 13 Oct 2016 21:06:56 +0000 (21:06 +0000)]
Merge "Only full-data back up regular files + directories" into nyc-mr1-dev
Greg Plesur [Thu, 13 Oct 2016 21:01:59 +0000 (21:01 +0000)]
Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev
Dianne Hackborn [Thu, 13 Oct 2016 20:36:38 +0000 (20:36 +0000)]
Merge "Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev
am:
33e56a9e1f
Change-Id: I74c2a5391f8eebf0544447886b14714fbd0202b1
Dianne Hackborn [Thu, 13 Oct 2016 20:31:43 +0000 (20:31 +0000)]
Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle
am:
851ec49de7
Change-Id: I8a5f8e28f8e4ca7e8fd20abacc0da1dae4055da7
Dianne Hackborn [Thu, 13 Oct 2016 20:21:23 +0000 (20:21 +0000)]
Merge "Fix issue #
32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev
Svetoslav Ganov [Thu, 13 Oct 2016 20:15:19 +0000 (20:15 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev
am:
cba436b312
Change-Id: Iccde94bb855b3461ddb804b69182c439f9c07e1f
Svetoslav Ganov [Thu, 13 Oct 2016 20:15:16 +0000 (20:15 +0000)]
Allow SetupWizard to do WiFi scans if location off
am:
b2457c3704
Change-Id: I3afe3d8628e8af5806b03b86ea5c866fd454cddd
Svetoslav Ganov [Thu, 13 Oct 2016 20:06:00 +0000 (20:06 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev
Christopher Tate [Thu, 13 Oct 2016 19:12:29 +0000 (12:12 -0700)]
Only full-data back up regular files + directories
Ignore every filesystem entity that is not a regular file or directory.
In particular, we now ignore not only symlinks but also sockets, pipes,
et cetera.
Bug
32143362
Change-Id: If51b54df1f7a643af145eb15bf12d389d19f8780
Greg Plesur [Mon, 10 Oct 2016 20:23:49 +0000 (16:23 -0400)]
DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should
return 'false' for Wear devices after pairing/upgrade.
BUG:
32019375
Change-Id: I2563efe58c98c5dd8440891e478c89e093d8d9ac
OSDN Git Service
