git.osdn.net Git - android-x86/frameworks-base.git/log

Garfield Tan [Fri, 14 Oct 2016 00:13:59 +0000 (00:13 +0000)]

Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev am: 8a032b98fe
am: 97944c00fe

Change-Id: I85c8c7c4bf1d4e3f8a3904b2c417f5ec20cb520f

commit | commitdiff | tree

Garfield Tan [Fri, 14 Oct 2016 00:12:58 +0000 (00:12 +0000)]

DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails. am: d91dd17f36
am: cc6a8b5190

Change-Id: Ia361f86f771a5b59ce10d4aefb6a8a53e48b4c92

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Ben Lin [Fri, 14 Oct 2016 00:02:43 +0000 (00:02 +0000)]

Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev am: c8358bfe65
am: 642941d629

Change-Id: I48357c812334f6150ce903af470f865f99311fbd

commit | commitdiff | tree

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

commit | commitdiff | tree

Ben Lin [Fri, 14 Oct 2016 00:01:50 +0000 (00:01 +0000)]

Removing a mimeIcon specific for album folders from MediaProvider. am: 6d33357882
am: f3b7acecc7

Change-Id: I227fae0ffb4b97c5caec4cb60120486defdb8a81

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 23:02:18 +0000 (23:02 +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
am: 2bfef9bd82

Change-Id: I7dfe2deebed15505e4ee6777b6750588b7332882

commit | commitdiff | tree

Michal Karpinski [Thu, 13 Oct 2016 23:01:19 +0000 (23:01 +0000)]

Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev am: a6b3caf58e
am: 949a485e29

Change-Id: I65369538db700b4b8de7385c57242a5e5b7e922e

commit | commitdiff | tree

Michal Karpinski [Thu, 13 Oct 2016 23:00:24 +0000 (23:00 +0000)]

Don't expose default strong auth timeout as constant am: 6dbf67fc48
am: bc755da55c

Change-Id: Idb118df5cf1a763645f4187bcddfa4bb9b8b42ee

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:51:02 +0000 (22:51 +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
am: 621d3bef8a

Change-Id: If80f808b31dc9d740d82109a9b8d17bcc2032fba

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:39:43 +0000 (22:39 +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
am: bdcd9b8a6d

Change-Id: Ifa785a9d5bd8e91812fe214a39b21294fe52bbac

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:38:41 +0000 (22:38 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours am: b576f816c5 am: db77b50424 am: 81fac8a618
am: bf535cb5d9

Change-Id: I6f99206f7571493514aa9d7153925e6d44438dca

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:26:57 +0000 (22:26 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Thu, 13 Oct 2016 22:22:36 +0000 (22:22 +0000)]

Merge "ExifInterface: Provide backward compatibility" into nyc-dev am: e29077105e am: 9dd9c5a856 am: 5554e0ac16
am: 19347eba88

Change-Id: Ie0bcf9d17172d804bf3c6912acceb933284ac99c

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:21:47 +0000 (22:21 +0000)]

ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510 am: 36f64a2f0c
am: b68d0855c4

Change-Id: I40df333d3b19911be333e5c466dfe01a3db4bd70

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:06:01 +0000 (22:06 +0000)]

ExifInterface: Provide backward compatibility am: 2dbe166801
am: bc813cd510

Change-Id: I0aa6d33baeec8dd991561d964bfce16915c0553d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 21:57:22 +0000 (21:57 +0000)]

ExifInterface: Provide backward compatibility
am: 2dbe166801

Change-Id: I53f2bfb056d955c6693cb65c9cb9a21859ff7535

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 21:56:56 +0000 (21:56 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility
am: c11f599a2f

Change-Id: If503e3361e69ad88a166f145603273d728d65652

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 21:56:55 +0000 (21:56 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility
am: 7ce9243087

Change-Id: I3d46cccc578160d7da5ff81e0caa09a52a17e9eb

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 21:54:25 +0000 (21:54 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility
am: 87a9ac70c3

Change-Id: I6639c6763ee1f7d83d03cc6d5fa11cbf1516e7cc

commit | commitdiff | tree

Sungsoo Lim [Thu, 13 Oct 2016 21:46:38 +0000 (21:46 +0000)]

Merge "ExifInterface: Provide backward compatibility" into nyc-dev

commit | commitdiff | tree

Christopher Tate [Thu, 13 Oct 2016 21:17:54 +0000 (21:17 +0000)]

Merge "Only full-data back up regular files + directories" into nyc-mr1-dev am: b3ca7c26e1
am: 82d9562f27

Change-Id: I04da3aeeecb65c557fe0715d7d97d182f07c43f0

commit | commitdiff | tree

Christopher Tate [Thu, 13 Oct 2016 21:17:09 +0000 (21:17 +0000)]

Only full-data back up regular files + directories am: da2018efeb
am: 0d816b8f69

Change-Id: I3b28c373c58ebebf27b1297e770d2023767e6396

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Greg Plesur [Thu, 13 Oct 2016 21:12:56 +0000 (21:12 +0000)]

Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev
am: 216ee1f0e7

Change-Id: I585c709c3a8648e754779c71497d18a35b321bb7

commit | commitdiff | tree

Greg Plesur [Thu, 13 Oct 2016 21:12:51 +0000 (21:12 +0000)]

DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade.
am: 3514404984

Change-Id: I8d24007831ba030af0d84f717802c79172db970f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dianne Hackborn [Thu, 13 Oct 2016 20:41:01 +0000 (20:41 +0000)]

Merge "Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev am: 33e56a9e1f
am: d3ad5ce147

Change-Id: Ic097998a5fdbe47831934baf0f8bdebcfd622007

commit | commitdiff | tree

Dianne Hackborn [Thu, 13 Oct 2016 20:38:04 +0000 (20:38 +0000)]

Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle am: 851ec49de7
am: 9774ea3646

Change-Id: I7e27381f7fa4ca8770ca06cdc6c0bdd18a549ae2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Svetoslav Ganov [Thu, 13 Oct 2016 20:20:55 +0000 (20:20 +0000)]

Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev am: cba436b312
am: 8d3fc0fd8a

Change-Id: I3002282020faf541fc37e1137a3c89d23b99f416

commit | commitdiff | tree

Svetoslav Ganov [Thu, 13 Oct 2016 20:19:45 +0000 (20:19 +0000)]

Allow SetupWizard to do WiFi scans if location off am: b2457c3704
am: ff484bbfeb

Change-Id: I7f6cda2da22347375507a0364e976bbb01066ccc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Oct 2016 19:21:32 +0000 (19:21 +0000)]

Merge "Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am: 2acaf0a120 am: f3d638b1d3" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Kevin Hufnagle [Thu, 13 Oct 2016 19:20:48 +0000 (19:20 +0000)]

Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am: 2acaf0a120
am: f3d638b1d3

Change-Id: I1613de506cb28ae1bb0e24afce1f9262e780332d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Oct 2016 19:20:29 +0000 (19:20 +0000)]

Merge "docs: Removed "Accessibility" page from "Pure Android" design docs am: 1965375aa5 am: 906703d124" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Kevin Hufnagle [Thu, 13 Oct 2016 19:19:55 +0000 (19:19 +0000)]

docs: Removed "Accessibility" page from "Pure Android" design docs am: 1965375aa5
am: 906703d124

Change-Id: I4bc463517602130e36d6ff126f7387214073f4cc

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Oct 2016 19:19:38 +0000 (19:19 +0000)]

Merge "docs: Changed Google Analytics link to https:// am: 374ddfe529 am: b3fcc389d2" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Andrew Solovay [Thu, 13 Oct 2016 19:18:57 +0000 (19:18 +0000)]

docs: Changed Google Analytics link to https:// am: 374ddfe529
am: b3fcc389d2

Change-Id: Ib2514a3735156498573e84daaba68fe2dfcd49ce

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Oct 2016 19:18:40 +0000 (19:18 +0000)]

Merge "Merge "docs: Add Android developer written case studies" into nyc-dev am: d2c5657e9c am: e28b5e72af" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Joe Fernandez [Thu, 13 Oct 2016 19:18:08 +0000 (19:18 +0000)]

Merge "docs: Add Android developer written case studies" into nyc-dev am: d2c5657e9c
am: e28b5e72af

Change-Id: I0f92c59eabacfce3f8b206fcda8ceac143bfc1e4

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Oct 2016 19:17:51 +0000 (19:17 +0000)]

Merge "docs: Add Android developer written case studies am: cf71b1fdc0 am: 22008c24ed" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

George French [Thu, 13 Oct 2016 19:17:22 +0000 (19:17 +0000)]

docs: Add Android developer written case studies am: cf71b1fdc0
am: 22008c24ed

Change-Id: I12ec64b7e0362728eca32ca61795e65904cc9b74

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Oct 2016 19:17:20 +0000 (19:17 +0000)]

Merge "Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am: 4bd56fbbee am: 622e97ffaf" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chris Tate [Thu, 13 Oct 2016 19:16:47 +0000 (19:16 +0000)]

Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am: 4bd56fbbee
am: 622e97ffaf

Change-Id: I5ebed04800d3acf758787067b63bca50fa957649

commit | commitdiff | tree

Joe Fernandez [Thu, 13 Oct 2016 19:16:35 +0000 (19:16 +0000)]

Merge "Docs: Developer written case studies batch 3 (proj 31)" into nyc-dev am: cae752e66b
am: c923831485

Change-Id: Icc9e5f1076d73f5a4701f28af60fafa99f80fa72

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Oct 2016 19:14:06 +0000 (19:14 +0000)]

Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5 am: 4cb8e2de6f" into nyc-mr1-dev-plus-aosp