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

Sungsoo [Fri, 14 Oct 2016 14:34:17 +0000 (14:34 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours am: b576f816c5
am: 315b8b7bbc

Change-Id: I77c388c612abb7e315a7aacc6de51b2648716421

commit | commitdiff | tree

Sungsoo Lim [Fri, 14 Oct 2016 14:33:20 +0000 (14:33 +0000)]

Merge "ExifInterface: Provide backward compatibility" into nyc-dev am: e29077105e
am: 013d3a4964

Change-Id: I5b57c744a880b595c3502491d41957832f3ee520

commit | commitdiff | tree

Sungsoo [Fri, 14 Oct 2016 14:32:31 +0000 (14:32 +0000)]

ExifInterface: Provide backward compatibility am: 2dbe166801
am: 6e01f028ab

Change-Id: Ibda28727ab8de7c7576e46dba411d9ba334ab1a4

commit | commitdiff | tree

Svetoslav Ganov [Fri, 14 Oct 2016 14:31:42 +0000 (14:31 +0000)]

Merge "Allow SetupWizard to do WiFi scans if location off" am: c98b34bdce am: 72510e6244
am: cf146edb32

Change-Id: Icb456bac6bf5bf357848d73356adbd8772c37817

commit | commitdiff | tree

Bert McMeen [Fri, 14 Oct 2016 14:30:44 +0000 (14:30 +0000)]

Docs: Updates to the Download/Test file related to watch setup am: 137c545e4e
am: 4c5141b98b

Change-Id: I5a819483cb7acab434c81442dee13ee3c80f9e28

commit | commitdiff | tree

Yuta Yamada [Fri, 14 Oct 2016 14:29:58 +0000 (14:29 +0000)]

Merge "Fix memory leak of Dnd tile" am: 6057a8360a am: 465397e28e
am: be3b53beca

Change-Id: I12dae89a0b577379e7a868182b535f5dcda09d36

commit | commitdiff | tree

Selim Cinek [Fri, 14 Oct 2016 14:29:03 +0000 (14:29 +0000)]

Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am: 6f3a05ae77 -s ours am: 20307881d7 -s ours
am: e58f1e5965

Change-Id: I483d2f52d347d2fb0064a6f9a0e6db3d5a61aa67

commit | commitdiff | tree

Selim Cinek [Fri, 14 Oct 2016 14:28:12 +0000 (14:28 +0000)]

Merge "DO NOT MERGE - Added translations for emergency action string" am: d33e79c328 -s ours am: cb654a5fbd -s ours
am: 8bd7df4536

Change-Id: I89a5d36d40cd1b1973f99406905bafc20ba1c8dc

commit | commitdiff | tree

Robert Greenwalt [Fri, 14 Oct 2016 14:27:22 +0000 (14:27 +0000)]

Merge "Add free short codes for direct carrier billing and others" am: 73c50f7dbc am: 6f8c54a16d
am: 2b06e19f2d

Change-Id: I50e107a8dc433cdc563ad6663ec5feef8e992fc2

commit | commitdiff | tree

Shinji Sogo [Fri, 14 Oct 2016 14:26:32 +0000 (14:26 +0000)]

Merge "Don't compare FQDN with providerFriendlyName" am: aae64557e1 am: 9c84160545
am: b8bab1df10

Change-Id: Ic019a0f04737d128cc5005be8fe9733f30ee44a3

commit | commitdiff | tree

Adam Lesinski [Fri, 14 Oct 2016 14:25:39 +0000 (14:25 +0000)]

Merge "RRO: Synchronize access to overlays.list" am: 78382db820 am: 1b9303e8f0
am: c68597e671

Change-Id: I067a006032a73d646f779669db9dcf6a25020709

commit | commitdiff | tree

Jorim Jaggi [Fri, 14 Oct 2016 14:24:48 +0000 (14:24 +0000)]

Merge "Fix split-screen flash issue" am: 6738617652 am: f1fed4de21
am: 4e7407a80e

Change-Id: Ibfef3bd01a54cca64a2f0de197bd9480a7539cd0

commit | commitdiff | tree

Rebecca Silberstein [Fri, 14 Oct 2016 14:23:56 +0000 (14:23 +0000)]

Merge "Tethering: check if configManager is null" am: e011bf80c5 am: d1e4dbf002
am: d33a0ee710

Change-Id: I2d8cfac1093b6973b2b5f06e2ba37cff9866d82a

commit | commitdiff | tree

Brad Ebinger [Fri, 14 Oct 2016 14:22:38 +0000 (14:22 +0000)]

Merge "Transplant the Logging system from Telecom" am: cbb03d1ad3 am: 951dca8209
am: 0ab9a078e9

Change-Id: I79e6b2de4bf523036ed1d15debd142a1786249c5

commit | commitdiff | tree

Christopher Wiley [Fri, 14 Oct 2016 14:21:39 +0000 (14:21 +0000)]

Merge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc am: eedd2b529d
am: 53d12379f4

Change-Id: I4bcde8dde8c3bad7754e26dd56f8321032daa5a3

commit | commitdiff | tree

John Reck [Fri, 14 Oct 2016 14:20:42 +0000 (14:20 +0000)]

Merge "Fix SurfaceViewPositionListener race bugs" am: 2dc11c0500 am: ee3adf6d91
am: f136fa872f

Change-Id: Ifd944500fb75bdefa30e0f083e26b0de2cc1cb3a

commit | commitdiff | tree

Andre Eisenbach [Fri, 14 Oct 2016 14:19:49 +0000 (14:19 +0000)]

Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" am: 5c043f51b0 am: 3c3329bd34
am: d6a85bdea3

Change-Id: Id01a44e2424cb71b7ab89592d84de272b25ae0fe

commit | commitdiff | tree

Andreas Gampe [Fri, 14 Oct 2016 14:18:58 +0000 (14:18 +0000)]

Merge "Debug: Use UniqueFile" am: 546f755bf8 am: 8d151b26c2
am: 77a2f22f77

Change-Id: Ib904c45f715b742f3cd78c54c9bddbda1dc0946b

commit | commitdiff | tree

Selim Cinek [Fri, 14 Oct 2016 14:17:58 +0000 (14:17 +0000)]

Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours am: 00c553e1ba -s ours
am: 8f681f7220

Change-Id: Ic3fe3a5021097097a3b818040e046de1e9011941

commit | commitdiff | tree

lei.peng [Fri, 14 Oct 2016 14:17:07 +0000 (14:17 +0000)]

Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3c1 am: 93c75d07c1
am: d975003af3

Change-Id: If4ff1ee251842598f1a5e8dedb7858daed201206

commit | commitdiff | tree

Stephen Li [Fri, 14 Oct 2016 14:16:15 +0000 (14:16 +0000)]

Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master am: 6accb573ab
am: 7cbe133507

Change-Id: I7f1aa17fecc22655a80ddc993786fa77039fa71b

commit | commitdiff | tree

Jordan Liu [Fri, 14 Oct 2016 14:15:26 +0000 (14:15 +0000)]

Add cdma_3waycall_flash_delay key to CarrierConfig am: e5535d71fc
am: 90c20a884d

Change-Id: Iea5e694e0cafc74f2c17286737ce22403f39f0e7

commit | commitdiff | tree

Stephen Li [Fri, 14 Oct 2016 14:14:26 +0000 (14:14 +0000)]

Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." into stage-aosp-master am: 302b99512f
am: 5428d11e23

Change-Id: I047d87af55905122c8d032c06919a0d58e929cd8

commit | commitdiff | tree

Robert Sesek [Fri, 14 Oct 2016 14:13:27 +0000 (14:13 +0000)]

Merge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am: adb4389cc1

Change-Id: Ic031be1b1efa6fc5555ad02a4e00f810213deda9

commit | commitdiff | tree

Robert Sesek [Fri, 14 Oct 2016 14:07:57 +0000 (14:07 +0000)]

Merge "resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:27:40 +0000 (09:27 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: dc7280fe74 -s ours
am: 44de8bed78 -s ours

Change-Id: Icf52bab9a22de5f71dbf4ab376e77e1a8c2a5027

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:26:39 +0000 (09:26 +0000)]

Import translations. DO NOT MERGE am: ade9e011a8 -s ours
am: 40e8df7169 -s ours

Change-Id: I319801dd4f7ca83db79cbd76e3b717cf718252bc

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:22:27 +0000 (09:22 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e3c1d48dc0 -s ours" into cw-f-dev
am: c4c7942ee2 -s ours

Change-Id: I4600e0f79e4d068607e8c210b2a10559ae557cbb

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:22:22 +0000 (09:22 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e3c1d48dc0 -s ours
am: fca9f14523 -s ours

Change-Id: I93d33092855c51ea31bd376ea49e3a312bb88eac

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:20:58 +0000 (09:20 +0000)]

Merge "Import translations. DO NOT MERGE am: cda884446e -s ours" into cw-f-dev
am: a96ca901cc -s ours

Change-Id: I7985ed5d491f052aa70ab58bd71fe5474d5f834f

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:20:54 +0000 (09:20 +0000)]

Import translations. DO NOT MERGE am: cda884446e -s ours
am: a4999db816 -s ours

Change-Id: I311398a105adc70088fb628bd84fd3c360b973da

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:19:33 +0000 (09:19 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a2dabae9dd -s ours" into cw-f-dev
am: 18593450fc -s ours

Change-Id: I8f8fa42d04a17027bbb27073ff14a56e78143b41

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:19:27 +0000 (09:19 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a2dabae9dd -s ours
am: 8f1a1aace1 -s ours

Change-Id: I30fc17073009bfc08819ad6db1f8215e28e092a5

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:17:56 +0000 (09:17 +0000)]

Merge "Import translations. DO NOT MERGE am: 3e8a8c97bb -s ours" into cw-f-dev
am: 3337a3ef87 -s ours

Change-Id: Iba964ce6d5342d54f544311fa109dc650be28637

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:17:52 +0000 (09:17 +0000)]

Import translations. DO NOT MERGE am: 3e8a8c97bb -s ours
am: 5dca6db3ba -s ours

Change-Id: I8c55c0ead2b5ae0865d7fbd189220a2f20e27a43

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:16:39 +0000 (09:16 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 73d6846d28 -s ours

Change-Id: I5e5827ccf9759a118d6cc2bc31c0d7414292a78c

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:16:35 +0000 (09:16 +0000)]

Import translations. DO NOT MERGE
am: f32982dad6 -s ours

Change-Id: I7195f0f0f464516a29dbb853a8e3623fc845b7f9

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:15:11 +0000 (09:15 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 56f7606fa1 -s ours

Change-Id: I0e526ccef4fa53e447e3fc27bef49595672e6857

commit | commitdiff | tree

Bill Yi [Fri, 14 Oct 2016 09:15:07 +0000 (09:15 +0000)]

Import translations. DO NOT MERGE
am: 9396a20e3f -s ours

Change-Id: I82d06bff01dd03a8d0842b5db8f7f35867e3c315

commit | commitdiff | tree

TreeHugger Robot [Fri, 14 Oct 2016 09:12:50 +0000 (09:12 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 14 Oct 2016 09:08:52 +0000 (09:08 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 14 Oct 2016 09:08:31 +0000 (09:08 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 14 Oct 2016 09:04:59 +0000 (09:04 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 14 Oct 2016 09:04:08 +0000 (09:04 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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