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

Erik Kline [Fri, 22 Jul 2016 01:56:33 +0000 (01:56 +0000)]

Support removing specific routes from local_network am: 6599ee8b96
am: 51c8fe903b

Change-Id: I02c0805c38e11226bd11b815da5418f1afc1ab89

commit | commitdiff | tree

Bill Yi [Fri, 22 Jul 2016 01:53:57 +0000 (01:53 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: e3f28911af -s ours
am: 6ca7959ea9 -s ours

Change-Id: Ib82db2dd0c41e8a6db91ad59e930107b6e2d247b

commit | commitdiff | tree

Bill Yi [Fri, 22 Jul 2016 01:53:54 +0000 (01:53 +0000)]

Import translations. DO NOT MERGE am: 8eff1c381b -s ours
am: ed70bc2077 -s ours

Change-Id: I0d09b52dd4d3e7bd54ca01b101f7abf41cca5c2d

commit | commitdiff | tree

Thierry Strudel [Fri, 22 Jul 2016 01:53:51 +0000 (01:53 +0000)]

Merge changes from topic \\'enable_persist_kernel_log\\' into nyc-mr1-dev am: 1a48150980
am: 27b73a8a1c

Change-Id: Ic1c4a4f40718faf9e328228376da6363216ccec1

commit | commitdiff | tree

Mark Salyzyn [Fri, 22 Jul 2016 01:53:47 +0000 (01:53 +0000)]

Settings: add logpersist kernel only selection (strings) am: 66b89bc2da
am: 37e4077f66

Change-Id: If071745ff9bdc4aaf7644405fa1f42586a904f59

commit | commitdiff | tree

Mark Salyzyn [Fri, 22 Jul 2016 01:53:43 +0000 (01:53 +0000)]

Settings: add logpersist selection (strings) am: 3e05a70543 -s ours
am: 475e451a14

Change-Id: I95cf84e22985b6064020630941893b3279ec02c6

commit | commitdiff | tree

Erik Kline [Fri, 22 Jul 2016 01:45:39 +0000 (01:45 +0000)]

Support removing specific routes from local_network
am: 6599ee8b96

Change-Id: I51a341796698ff02aa7a62f5f8b66050982f488e

commit | commitdiff | tree

Bill Yi [Fri, 22 Jul 2016 01:45:35 +0000 (01:45 +0000)]

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

Change-Id: I57bb5d48154f9eadbe6657d3af6861fc1f673ee9

commit | commitdiff | tree

Bill Yi [Fri, 22 Jul 2016 01:45:31 +0000 (01:45 +0000)]

Import translations. DO NOT MERGE
am: 8eff1c381b -s ours

Change-Id: Ifea203c04a0312a552568b842e464252e3506cb7

commit | commitdiff | tree

Mark Salyzyn [Fri, 22 Jul 2016 01:45:14 +0000 (01:45 +0000)]

Merge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
am: 1a48150980

Change-Id: I1e9eb21d5df60caf717e056bb571e93add127075

commit | commitdiff | tree

Mark Salyzyn [Fri, 22 Jul 2016 01:44:47 +0000 (01:44 +0000)]

Settings: add logpersist kernel only selection (strings)
am: 66b89bc2da

Change-Id: I296fcbdc2bfee105bc0ce838c75989d32e14b12e

commit | commitdiff | tree

Mark Salyzyn [Fri, 22 Jul 2016 01:39:47 +0000 (01:39 +0000)]

Settings: add logpersist selection (strings)
am: 3e05a70543 -s ours

Change-Id: Ia4d081b5db59fdc2f518d04129216f8d014bdbbe

commit | commitdiff | tree

TreeHugger Robot [Fri, 22 Jul 2016 01:18:52 +0000 (01:18 +0000)]

Merge "Handle partial clip files by showing a failure notification."

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 22 Jul 2016 00:30:57 +0000 (00:30 +0000)]

Merge "[NAN] Fix TlvElement member names - reflect public access. am: e40b4d344e"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 22 Jul 2016 00:30:46 +0000 (00:30 +0000)]

Merge "[NAN] TLV utilities iterator - throw correct exception am: 3e5ac12302"

commit | commitdiff | tree

Etan Cohen [Fri, 22 Jul 2016 00:30:01 +0000 (00:30 +0000)]

[NAN] Fix TlvElement member names - reflect public access.
am: e40b4d344e

Change-Id: I22cc48b0ba4b873c299fb01df1a925cea8f5727a

commit | commitdiff | tree

Etan Cohen [Fri, 22 Jul 2016 00:29:46 +0000 (00:29 +0000)]

[NAN] TLV utilities iterator - throw correct exception
am: 3e5ac12302

Change-Id: Ic6638a0d937f9eddba34cc1777655ab05e0e1bf6

commit | commitdiff | tree

Andrew Solovay [Fri, 22 Jul 2016 00:29:25 +0000 (00:29 +0000)]

Merge \\\\"docs: Replacing curly apostrophes with straight ones\\\\" into nyc-docs am: 1d545c4f83 am: adfb20c2f0 am: cc94c31e15
am: 37e98c1233

Change-Id: Ic2042261717580bb5cbe73b4b29a39d2d9807a2d

commit | commitdiff | tree

Andrew Solovay [Fri, 22 Jul 2016 00:29:22 +0000 (00:29 +0000)]

docs: Replacing curly apostrophes with straight ones am: abea4b1dcd am: 85d40b4feb am: c3ec8f28a5
am: bc0f9cad4f

Change-Id: I502fb6957cb36b903151cf68d9a97a704dabff53

commit | commitdiff | tree

Andrew Solovay [Fri, 22 Jul 2016 00:07:48 +0000 (00:07 +0000)]

Merge \\\"docs: Replacing curly apostrophes with straight ones\\\" into nyc-docs am: 1d545c4f83 am: adfb20c2f0
am: cc94c31e15

Change-Id: I6be807b81d6d7686ed98a9adead875ecfbbd06bf

commit | commitdiff | tree

Andrew Solovay [Fri, 22 Jul 2016 00:07:45 +0000 (00:07 +0000)]

docs: Replacing curly apostrophes with straight ones am: abea4b1dcd am: 85d40b4feb
am: c3ec8f28a5

Change-Id: Iff015598faf6f2026be06077b84209b967199f6d

commit | commitdiff | tree

Andrew Solovay [Thu, 21 Jul 2016 23:56:57 +0000 (23:56 +0000)]

Merge \\"docs: Replacing curly apostrophes with straight ones\\" into nyc-docs am: 1d545c4f83
am: adfb20c2f0

Change-Id: I45b64c1ad1359f4ce908db07d968cffeb9406ace

commit | commitdiff | tree

Andrew Solovay [Thu, 21 Jul 2016 23:56:50 +0000 (23:56 +0000)]

docs: Replacing curly apostrophes with straight ones am: abea4b1dcd
am: 85d40b4feb

Change-Id: I7bac719771e700f33e1081a34a76d3f656bbe65d

commit | commitdiff | tree

Andrew Solovay [Thu, 21 Jul 2016 23:48:00 +0000 (23:48 +0000)]

Merge \"docs: Replacing curly apostrophes with straight ones\" into nyc-docs
am: 1d545c4f83

Change-Id: Ia21fd5e04dc0565feea5207951372e6ceaf60e38

commit | commitdiff | tree

Andrew Solovay [Thu, 21 Jul 2016 23:47:58 +0000 (23:47 +0000)]

docs: Replacing curly apostrophes with straight ones
am: abea4b1dcd

Change-Id: I1fd344ed7087b962a66d577b1c3cb5fa0e81fbaa

commit | commitdiff | tree

Garfield, Tan [Thu, 21 Jul 2016 18:10:44 +0000 (11:10 -0700)]

Handle partial clip files by showing a failure notification.

Bug: 30221384
Change-Id: Ib32b6b5ca5b8f7be887b8f35b80daeeb33770cbe

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Jul 2016 23:07:15 +0000 (23:07 +0000)]

Merge "docs: Replacing curly apostrophes with straight ones" into nyc-docs

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Jul 2016 23:03:14 +0000 (23:03 +0000)]

Merge "Change the color of loading spinner to the color of selected roots."

commit | commitdiff | tree

Etan Cohen [Thu, 21 Jul 2016 22:52:53 +0000 (22:52 +0000)]

[NAN] Modify arguments from \"array, length\" to \"array\"
am: 0a5b7efcb2

Change-Id: I0ce1c4cbaac1f54f67d2593e31f2956e67b5eb9f

commit | commitdiff | tree

David Gross [Thu, 21 Jul 2016 22:25:38 +0000 (22:25 +0000)]

resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp am: 289688de68
am: 619fa2673f

Change-Id: Id9c94a0b2b3b0b89e297a7bc7dddc0b5a51aede5

commit | commitdiff | tree

Sreevani Sreejith [Thu, 21 Jul 2016 22:25:35 +0000 (22:25 +0000)]

Merge \\\"Merge \\\\\"docs: Fixed typo.\\\\\" into mnc-io-docs am: 71f742920d am: 9b911b8736\\\" into nyc-dev am: 7e9ce5ceaa am: d0516671b1
am: 7b82ec394b

Change-Id: Iff072a3ce97ab41923490c136756eccd7f124f46

commit | commitdiff | tree

sreevanis [Thu, 21 Jul 2016 22:25:32 +0000 (22:25 +0000)]

Merge \\\\\"docs: Fixed typo.\\\\\" into mnc-io-docs am: 71f742920d am: 01f12a9e18 am: daaa7b7e5b am: 11dca20c16
am: 5ae40a1f74

Change-Id: Ie4501a357689f226672bcc124dd075b068ff1a75

commit | commitdiff | tree

Allison Babick [Thu, 21 Jul 2016 22:22:32 +0000 (22:22 +0000)]

Merge "Add user-modifiable downloads backup conditions."

commit | commitdiff | tree

David Gross [Thu, 21 Jul 2016 21:56:11 +0000 (21:56 +0000)]

resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp
am: 289688de68

Change-Id: I652da37413ea880c902cc6ff2a40526f481da9dc

commit | commitdiff | tree

David Gross [Thu, 21 Jul 2016 21:06:20 +0000 (14:06 -0700)]

resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp

Change-Id: Iaa22f6c36676974223919918657f5d04d94e482e

commit | commitdiff | tree

Sreevani Sreejith [Thu, 21 Jul 2016 20:50:37 +0000 (20:50 +0000)]

Merge \\"Merge \\\\"docs: Fixed typo.\\\\" into mnc-io-docs am: 71f742920d am: 9b911b8736\\" into nyc-dev am: 7e9ce5ceaa
am: d0516671b1

Change-Id: Ib04d6cc64908182d7c394cf30f3bd00755031e81

commit | commitdiff | tree

Sreevani Sreejith [Thu, 21 Jul 2016 20:50:34 +0000 (20:50 +0000)]

Merge \\\\"docs: Fixed typo.\\\\" into mnc-io-docs am: 71f742920d am: 01f12a9e18 am: daaa7b7e5b
am: 11dca20c16

Change-Id: I288effe4723b1620a4530c7ee19f20bd789854e6

commit | commitdiff | tree

Andrew Solovay [Thu, 21 Jul 2016 20:50:23 +0000 (13:50 -0700)]

docs: Replacing curly apostrophes with straight ones

Need to have a CL ready to go in case that's necessary to force
a docs build on the new branch, so I'm setting up this one. Doing
nothing but changing ’ to ' in a few files.

Change-Id: I408f9152d4898e75ab34a92606620afeaf4d3ab9

commit | commitdiff | tree

Sreevani Sreejith [Thu, 21 Jul 2016 20:43:06 +0000 (20:43 +0000)]

Merge \"Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 9b911b8736\" into nyc-dev
am: 7e9ce5ceaa

Change-Id: Ic5f9b2cd6e099cc350b07ba81cdd96700cfd9077

commit | commitdiff | tree

sreevanis [Thu, 21 Jul 2016 20:43:02 +0000 (20:43 +0000)]

Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 01f12a9e18
am: daaa7b7e5b

Change-Id: I4d8a02a6e09e967733f1d0ec36a23f4a73ce40f2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Jul 2016 20:39:26 +0000 (20:39 +0000)]

Merge "Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d am: 9b911b8736" into nyc-dev

commit | commitdiff | tree

Sreevani Sreejith [Thu, 21 Jul 2016 20:38:53 +0000 (20:38 +0000)]

Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
am: 9b911b8736

Change-Id: If294d38647849c51c2ba46b041417346a410c533

commit | commitdiff | tree

Sreevani Sreejith [Thu, 21 Jul 2016 20:38:48 +0000 (20:38 +0000)]

Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
am: 01f12a9e18

Change-Id: I3c72f75050a4426d4e67fd6a73b7d0f3bc8eff71

commit | commitdiff | tree

sreevanis [Thu, 21 Jul 2016 20:32:55 +0000 (20:32 +0000)]

Merge \"docs: Fixed typo.\" into mnc-io-docs
am: 71f742920d

Change-Id: Ia489afb465582c6600d35ffed5826816b4043746

commit | commitdiff | tree

sreevanis [Thu, 21 Jul 2016 20:32:51 +0000 (20:32 +0000)]

Merge \"docs: Fixed typo.\" into mnc-io-docs
am: 71f742920d

Change-Id: Ife230ca465a93b9cad9367d302fe402e574f3175

commit | commitdiff | tree

Sreevani Sreejith [Thu, 21 Jul 2016 20:24:50 +0000 (20:24 +0000)]

Merge "docs: Fixed typo." into mnc-io-docs

commit | commitdiff | tree

Kirill Grouchnikov [Thu, 21 Jul 2016 18:56:00 +0000 (18:56 +0000)]

Merge "Tweaking scroll-related functionality of AbsListView"

commit | commitdiff | tree

David Gross [Thu, 21 Jul 2016 18:43:15 +0000 (11:43 -0700)]

resolve merge conflicts of ed6625d to stage-aosp-master

Change-Id: Icae5872d5e220ac18a35e338f10b194c286855a8

commit | commitdiff | tree

Amanda Kassay [Thu, 21 Jul 2016 17:19:40 +0000 (17:19 +0000)]

Merge \\\"Adding projec.yaml files to all top/sub categories.\\\" into nyc-dev am: 5a76378471 am: 07d5731381
am: 5ebc9dcec2

Change-Id: I092f82b417ec89a695ec9890804a99ca2c12124f

commit | commitdiff | tree

Amanda Kassay [Thu, 21 Jul 2016 17:13:36 +0000 (17:13 +0000)]

Merge \\"Adding projec.yaml files to all top/sub categories.\\" into nyc-dev am: 5a76378471
am: 07d5731381

Change-Id: Iba9139457028ae8a398dd5681e5d6c26305f8f4d

commit | commitdiff | tree

Amanda Kassay [Thu, 21 Jul 2016 17:09:39 +0000 (17:09 +0000)]

Merge \"Adding projec.yaml files to all top/sub categories.\" into nyc-dev
am: 5a76378471

Change-Id: Ib4e0a75117044599c72de287039c60f0391788c2

commit | commitdiff | tree

Amanda Kassay [Thu, 21 Jul 2016 17:02:12 +0000 (17:02 +0000)]

Merge "Adding projec.yaml files to all top/sub categories." into nyc-dev

commit | commitdiff | tree

David Gross [Thu, 21 Jul 2016 16:15:37 +0000 (16:15 +0000)]

Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup."

commit | commitdiff | tree

Benjamin Franz [Thu, 21 Jul 2016 15:57:21 +0000 (15:57 +0000)]

Merge \\\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 am: cb805b35f3 -s ours am: 662e2a7975 am: 461309a63a
am: 1ca903022c -s ours

Change-Id: Ia7b3c9756c7224ac38c028d9018813442fe02436

commit | commitdiff | tree

Billy Lamberta [Thu, 21 Jul 2016 15:57:15 +0000 (15:57 +0000)]

Merge \\\"docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919\\\" into nyc-dev am: 7dbcfcadd5 am: 4f93fdb999
am: f472f858d3

Change-Id: I79a3e554c46880d6d7c7dd73ccd2775671a27399

commit | commitdiff | tree

Billy Lamberta [Thu, 21 Jul 2016 15:57:08 +0000 (15:57 +0000)]

docs: work - Managed configuration bundles am: ef57498142 am: 9684f2cd2f am: c7cffa3e6a am: 576f482813
am: 7509892568

Change-Id: I3187adf6f20e06296d1440986d68bd08398ee64a

commit | commitdiff | tree

Amanda Kassay [Thu, 21 Jul 2016 15:57:00 +0000 (15:57 +0000)]

Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am: 83fb75ded3 am: e9d58227bb am: 0d6757dafd
am: 1825bb09ef

Change-Id: Ibc27ac036690bff63481e54e88fefb0fa91fcdc1

commit | commitdiff | tree

Benjamin Franz [Thu, 21 Jul 2016 15:50:39 +0000 (15:50 +0000)]

Merge \\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 am: cb805b35f3 -s ours am: 662e2a7975
am: 461309a63a

Change-Id: Id36d384021feafabd71ff382ca8054da2f67a722

commit | commitdiff | tree

Billy Lamberta [Thu, 21 Jul 2016 15:50:37 +0000 (15:50 +0000)]

Merge \\"docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919\\" into nyc-dev am: 7dbcfcadd5
am: 4f93fdb999

Change-Id: I41fb264f3388716fb4ec08c058f2210752611228

commit | commitdiff | tree

Billy Lamberta [Thu, 21 Jul 2016 15:50:35 +0000 (15:50 +0000)]

docs: work - Managed configuration bundles am: ef57498142 am: 9684f2cd2f am: c7cffa3e6a
am: 576f482813

Change-Id: I3d6c2b990f67864969b14304066c6f853fd2708c

commit | commitdiff | tree

Amanda Kassay [Thu, 21 Jul 2016 15:50:33 +0000 (15:50 +0000)]

Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am: 83fb75ded3 am: e9d58227bb
am: 0d6757dafd

Change-Id: I704345cd4efb8a1aa76f8bd24cfa782e16b176d7

commit | commitdiff | tree

Benjamin Franz [Thu, 21 Jul 2016 15:39:58 +0000 (15:39 +0000)]

Merge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 am: cb805b35f3 -s ours
am: 662e2a7975

Change-Id: I453d98b170f1383ad41f5e73b8f0818240f4778d

commit | commitdiff | tree

Mark Lu [Thu, 21 Jul 2016 15:39:58 +0000 (15:39 +0000)]

Merge \\\"docs: fixed \\\'@\\\' signs that were escaped improperly\\\" into nyc-dev am: a7ce29962c am: 876f854c3e
am: 39c1ef4e64

Change-Id: Ieb99aabbe3de3dac48c63fdc36007ae267d7314a

commit | commitdiff | tree

Billy Lamberta [Thu, 21 Jul 2016 15:39:55 +0000 (15:39 +0000)]

Merge \"docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919\" into nyc-dev
am: 7dbcfcadd5

Change-Id: Id738efd3e5b66db417b45231defc240a144744b7

commit | commitdiff | tree

Billy Lamberta [Thu, 21 Jul 2016 15:39:52 +0000 (15:39 +0000)]

docs: work - Managed configuration bundles am: ef57498142 am: 9684f2cd2f
am: c7cffa3e6a

Change-Id: Ifa84e7599721abebb5093f5e932166737278ccfc

commit | commitdiff | tree

Amanda Kassay [Thu, 21 Jul 2016 15:39:48 +0000 (15:39 +0000)]

Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am: 83fb75ded3
am: e9d58227bb

Change-Id: I29289c7aaaf34fb2889c8438f754b050b2dc2aec

commit | commitdiff | tree

Mark Lu [Thu, 21 Jul 2016 15:35:43 +0000 (15:35 +0000)]

Merge \\"docs: fixed \\'@\\' signs that were escaped improperly\\" into nyc-dev am: a7ce29962c
am: 876f854c3e

Change-Id: I4dacd0136ff01983445ca68175f01bffd7842b9e

commit | commitdiff | tree

Benjamin Franz [Thu, 21 Jul 2016 15:27:28 +0000 (15:27 +0000)]

Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9
am: cb805b35f3 -s ours

Change-Id: Icbc3d0dbcce8e079a895f194c13a5fa35957bc09

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Jul 2016 15:22:31 +0000 (15:22 +0000)]

Merge "docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919" into nyc-dev

commit | commitdiff | tree

Mark Lu [Thu, 21 Jul 2016 15:22:14 +0000 (15:22 +0000)]

Merge \"docs: fixed \'@\' signs that were escaped improperly\" into nyc-dev
am: a7ce29962c

Change-Id: I7444f59361841b6e6051c8976869633eb1c0219a

commit | commitdiff | tree

Billy Lamberta [Thu, 21 Jul 2016 15:21:58 +0000 (15:21 +0000)]

docs: work - Managed configuration bundles am: ef57498142
am: ba633fc919

Change-Id: I819bc7a7568f4ea753b053338c7f73f64e80ec0e

commit | commitdiff | tree

Billy Lamberta [Thu, 21 Jul 2016 15:21:52 +0000 (15:21 +0000)]

docs: work - Managed configuration bundles am: ef57498142
am: 9684f2cd2f

Change-Id: Idaeea63ba30ecb86a4f60955bb4937357ba4fd1b

commit | commitdiff | tree

Amanda Kassay [Thu, 21 Jul 2016 15:21:50 +0000 (15:21 +0000)]

Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html
am: 83fb75ded3

Change-Id: Ib5e4d45692c54beb3b4fafe89ebc0a5c19400359

commit | commitdiff | tree

Erik Kline [Sun, 17 Jul 2016 12:28:39 +0000 (21:28 +0900)]

Support removing specific routes from local_network

Bug: 9580643
Change-Id: Id0aaf4bc7424797e2beef03fb18a2c1885a86509

commit | commitdiff | tree

Benjamin Franz [Thu, 21 Jul 2016 10:14:59 +0000 (10:14 +0000)]

Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093
am: 87534f4ac9

Change-Id: I05e37f474e496b41c39b7a160418d9f48a265fa3

commit | commitdiff | tree

Benjamin Franz [Thu, 21 Jul 2016 10:10:03 +0000 (10:10 +0000)]

Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am: 3e582390b3
am: 7abd7ba093

Change-Id: I8dd5c0934f135cd567ae6bf2f4edf759ed757dfe

commit | commitdiff | tree

Benjamin Franz [Thu, 21 Jul 2016 10:05:33 +0000 (10:05 +0000)]

Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
am: 3e582390b3

Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8

commit | commitdiff | tree

Benjamin Franz [Thu, 21 Jul 2016 09:59:41 +0000 (09:59 +0000)]

Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev

commit | commitdiff | tree

Ivan Gavrilovic [Thu, 21 Jul 2016 09:03:00 +0000 (09:03 +0000)]

Merge "Aapt main dex proguard rules - always keep application"

commit | commitdiff | tree

Jin Park [Thu, 14 Jul 2016 05:45:20 +0000 (14:45 +0900)]

ExifInterface: Add ORF file parse support

A ORF file has a unique way of storing its data. This CL adds code
that checks whether a file is a ORF file format and parses the data
according to specifications.

Bug: 29409358
Change-Id: I498408a9e02dfe567c2d427b037c30b06af74d7e

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Jul 2016 04:14:05 +0000 (04:14 +0000)]

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

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 04:13:00 +0000 (04:13 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c3264b01ed -s ours
am: 63157a3b6e -s ours

Change-Id: I52e26bf5c881a67547da4828ac19d2b4cfb30d77

commit | commitdiff | tree

Thierry Strudel [Thu, 21 Jul 2016 04:07:22 +0000 (04:07 +0000)]

Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev

* changes:
Settings: add logpersist kernel only selection (strings)
Settings: add logpersist selection (strings)

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 04:06:17 +0000 (04:06 +0000)]

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

Change-Id: Ia217a988e8816741bca4a04ba2a27c7e09eaf249

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Jul 2016 04:02:06 +0000 (04:02 +0000)]

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

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:55:41 +0000 (03:55 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 28cb163056 -s ours
am: d6803f7eec -s ours

Change-Id: If851a2131087c8a2199dc51f0ba4a8bce75fcc92

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:55:38 +0000 (03:55 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 50fd9a9ca4 -s ours
am: f536f4989d -s ours

Change-Id: I5331f5f50b3901b601ab0de53cf0d4c0b4166d96

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:55:35 +0000 (03:55 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 3638c9b330 -s ours
am: ffbdc55a1d -s ours

Change-Id: I6e0abeb5cf3064d95bb562ac8cca5d5b944b6316

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:55:32 +0000 (03:55 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: dfb24a204f -s ours
am: 74d10c0b14 -s ours

Change-Id: Ie3500be37250170ac803e80de5cfaf2976967e22

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:55:30 +0000 (03:55 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 09af2a1032 -s ours
am: 5ac71fee23 -s ours

Change-Id: Ib833f99b578d48c53ce481fc098e694cf8acc76d

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:48:17 +0000 (03:48 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c1079364cb -s ours
am: 0a94845a7e -s ours

Change-Id: Ie4030627ad6d4961f4479ee48b3efddcd828ae56

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:48:12 +0000 (03:48 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 60858a45cd -s ours
am: db8b36970c -s ours

Change-Id: I14d90c58dc1d04ac5ffc48ec92e015dfeae37f3c

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:48:06 +0000 (03:48 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: db89342ec6 -s ours
am: dab3b245e0 -s ours

Change-Id: Id0bad6507d9b495bc4f29f1b5d0f6892bcdd5bd0

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:47:59 +0000 (03:47 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: a9a03b5d7e -s ours
am: 71731a6d1a -s ours

Change-Id: Ic2b521dc5a8f71bbdac12777253975fd4fdd3cce

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:47:53 +0000 (03:47 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 98e71028c7 -s ours
am: 059a43818b -s ours

Change-Id: If3625bb70715da68be16a42bdc8116965039e0a0

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:42:33 +0000 (03:42 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 28cb163056 -s ours

Change-Id: I909f8334846a92370d136722d1aa8eaa1aa162ca

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:42:29 +0000 (03:42 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 50fd9a9ca4 -s ours

Change-Id: I92bcafd93bb2c1fe1818415b2f991fd677101dea

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:42:25 +0000 (03:42 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 3638c9b330 -s ours

Change-Id: Ice6116e80bcca10df08e8d6b178911f0b266e922

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:42:22 +0000 (03:42 +0000)]

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

Change-Id: I55132b678aa074c4f32794291208c794dc349a4e

commit | commitdiff | tree

Bill Yi [Thu, 21 Jul 2016 03:42:18 +0000 (03:42 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 09af2a1032 -s ours

Change-Id: Iacb267f7fb77bc555cbd537df6471f0b9c7a0007