OSDN Git Service

android-x86/frameworks-base.git
8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784...
David Friedman [Sat, 30 Jul 2016 06:21:12 +0000 (06:21 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784 am: 00f85a4794 am: acbe40ef64 am: c3ae3d1eb2
am: 21a7b9992f

Change-Id: I45acbc99aa4f772542b75ef6caa45638167b9b25

8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784...
David Friedman [Sat, 30 Jul 2016 06:21:08 +0000 (06:21 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784 am: 00f85a4794 am: 3cf674ee3a
am: d98cfeab73

Change-Id: Iaad320f01c03dd18fe169d86c795120b164fb4e9

8 years agoMerge \\\"Ensuring KeyguardService has the correct user when it starts\\\" into nyc...
Suprabh Shukla [Sat, 30 Jul 2016 06:21:04 +0000 (06:21 +0000)]
Merge \\\"Ensuring KeyguardService has the correct user when it starts\\\" into nyc-mr1-dev am: 81bd8d79cb am: 0a51d0c8cf
am: 2f8e6b3098

Change-Id: I6e3e76459ccfbe3e54518072dfe296d27cec5aff

8 years agoMerge "resolve merge conflicts of 16dedb7 to master"
TreeHugger Robot [Sat, 30 Jul 2016 00:16:56 +0000 (00:16 +0000)]
Merge "resolve merge conflicts of 16dedb7 to master"

8 years agoMerge "WifiConfiguration: Expose NetworkSelectionStatus strings"
Roshan Pius [Fri, 29 Jul 2016 22:58:47 +0000 (22:58 +0000)]
Merge "WifiConfiguration: Expose NetworkSelectionStatus strings"

8 years agoresolve merge conflicts of 16dedb7 to master
Suprabh Shukla [Fri, 29 Jul 2016 22:38:49 +0000 (15:38 -0700)]
resolve merge conflicts of 16dedb7 to master

Change-Id: I99024e13f69942f6d687e1f49fe66591c4844d97

8 years agoMerge "Set secure setting when all preloaded apps are installed"
TreeHugger Robot [Fri, 29 Jul 2016 20:22:44 +0000 (20:22 +0000)]
Merge "Set secure setting when all preloaded apps are installed"

8 years agoMerge "Fix build"
TreeHugger Robot [Fri, 29 Jul 2016 19:03:42 +0000 (19:03 +0000)]
Merge "Fix build"

8 years agoMerge "Delete orig DocumentsUI."
TreeHugger Robot [Fri, 29 Jul 2016 18:02:33 +0000 (18:02 +0000)]
Merge "Delete orig DocumentsUI."

8 years agoFix build
Colin Cross [Fri, 29 Jul 2016 17:46:58 +0000 (10:46 -0700)]
Fix build

addAppToekn and setAppTask have a new argument.

Change-Id: I8a66863ba4e1cb2991a9f2ae355d0b89e9789f57

8 years agoSet secure setting when all preloaded apps are installed
Fyodor Kupolov [Thu, 28 Jul 2016 00:45:12 +0000 (17:45 -0700)]
Set secure setting when all preloaded apps are installed

Bug: 30280710
Change-Id: Id87b51c53b1e553a6ab0a257be93baf7d31b6fe5

8 years agoMerge "Merge \\\\"Docs: fix broken image link in platforms architecture doc\\\\"...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:54:58 +0000 (16:54 +0000)]
Merge "Merge \\\\"Docs: fix broken image link in platforms architecture doc\\\\" into nyc-dev am: eb73a791fd am: d26ae56f9d am: 7e78990f32 am: edebec5e15"

8 years agoMerge "Docs: fix broken image link in platforms architecture doc am: 0ead099a87 am...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:54:49 +0000 (16:54 +0000)]
Merge "Docs: fix broken image link in platforms architecture doc am: 0ead099a87 am: 911d23165e am: 5c38240a10 am: b28400fd46"

8 years agoMerge "Merge \\\"Docs: fix broken image link in platforms architecture doc\\\" into...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:54:38 +0000 (16:54 +0000)]
Merge "Merge \\\"Docs: fix broken image link in platforms architecture doc\\\" into nyc-dev am: eb73a791fd am: 6aa966b7e6 am: 4578cadf33"

8 years agoMerge "Docs: fix broken image link in platforms architecture doc am: 0ead099a87 am...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:54:27 +0000 (16:54 +0000)]
Merge "Docs: fix broken image link in platforms architecture doc am: 0ead099a87 am: dca5dadaf0 am: 0b14d5f963"

8 years agoMerge "Merge \\\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:54:15 +0000 (16:54 +0000)]
Merge "Merge \\\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\\" into nyc-dev am: e67d1573eb am: 0f42315485 am: 5dc44a59fe am: 2b58870458"

8 years agoMerge \\\\"Docs: fix broken image link in platforms architecture doc\\\\" into nyc...
Adarsh Fernando [Fri, 29 Jul 2016 16:53:42 +0000 (16:53 +0000)]
Merge \\\\"Docs: fix broken image link in platforms architecture doc\\\\" into nyc-dev am: eb73a791fd am: d26ae56f9d am: 7e78990f32
am: edebec5e15

Change-Id: I6347e3942af7ede4757f67bc8d10ec88ef058834

8 years agoDocs: fix broken image link in platforms architecture doc am: 0ead099a87 am: 911d2316...
Adarsh Fernando [Fri, 29 Jul 2016 16:53:39 +0000 (16:53 +0000)]
Docs: fix broken image link in platforms architecture doc am: 0ead099a87 am: 911d23165e am: 5c38240a10
am: b28400fd46

Change-Id: I795406b372284e291e726dd1a172fc3e0a137f49

8 years agoMerge \\\"Docs: fix broken image link in platforms architecture doc\\\" into nyc...
Adarsh Fernando [Fri, 29 Jul 2016 16:53:36 +0000 (16:53 +0000)]
Merge \\\"Docs: fix broken image link in platforms architecture doc\\\" into nyc-dev am: eb73a791fd am: 6aa966b7e6
am: 4578cadf33

Change-Id: Id1006c84aaa91bd01fe579d1e0ac8fc18f1ed680

8 years agoDocs: fix broken image link in platforms architecture doc am: 0ead099a87 am: dca5dadaf0
Adarsh Fernando [Fri, 29 Jul 2016 16:53:33 +0000 (16:53 +0000)]
Docs: fix broken image link in platforms architecture doc am: 0ead099a87 am: dca5dadaf0
am: 0b14d5f963

Change-Id: I01e6483f83797a63b8da14478a5ec8e5df9978b6

8 years agoMerge \\\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\\...
David Friedman [Fri, 29 Jul 2016 16:53:29 +0000 (16:53 +0000)]
Merge \\\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\\" into nyc-dev am: e67d1573eb am: 0f42315485 am: 5dc44a59fe
am: 2b58870458

Change-Id: Ic9925a317556476abd2d2e4817257025709fef22

8 years agoMerge "Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: 4dd89b6d...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:52:23 +0000 (16:52 +0000)]
Merge "Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: 4dd89b6d86 am: 26c2bbca45 am: 507a07dd7b am: 0908a6e41d"

8 years agoMerge "Doc change: remove deprecated intl versions of notifications guidelines. am...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:52:15 +0000 (16:52 +0000)]
Merge "Doc change: remove deprecated intl versions of notifications guidelines. am: 223a1727cc am: 8478151729 am: aa308c94c9 am: 9a651a43c9 am: aa2ed314fc"

8 years agoMerge "Merge \\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:52:05 +0000 (16:52 +0000)]
Merge "Merge \\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\" into nyc-dev am: e67d1573eb am: 609ca92061 am: 13e07be077"

8 years agoMerge "Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: 4dd89b6d...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:51:57 +0000 (16:51 +0000)]
Merge "Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: 4dd89b6d86 am: c1f941e10f am: 8aab92c727"

8 years agoMerge "Doc change: remove deprecated intl versions of notifications guidelines. am...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:51:49 +0000 (16:51 +0000)]
Merge "Doc change: remove deprecated intl versions of notifications guidelines. am: 223a1727cc am: 8478151729 am: 68883c7a8a am: 56f481cfa9"

8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: 4dd89b6d86...
David Friedman [Fri, 29 Jul 2016 16:51:13 +0000 (16:51 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: 4dd89b6d86 am: 26c2bbca45 am: 507a07dd7b
am: 0908a6e41d

Change-Id: I85800ca77a43dc28c162499c527e78e8ae61e8e2

8 years agoDoc change: remove deprecated intl versions of notifications guidelines. am: 223a1727...
Dirk Dougherty [Fri, 29 Jul 2016 16:51:08 +0000 (16:51 +0000)]
Doc change: remove deprecated intl versions of notifications guidelines. am: 223a1727cc am: 8478151729 am: aa308c94c9 am: 9a651a43c9
am: aa2ed314fc

Change-Id: I34dd933289605a856c5bb767fe0aa1eea78d7b05

8 years agoMerge \\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\" into...
David Friedman [Fri, 29 Jul 2016 16:51:04 +0000 (16:51 +0000)]
Merge \\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\" into nyc-dev am: e67d1573eb am: 609ca92061
am: 13e07be077

Change-Id: Ibf1474f05df2ea2f19b260108d3ac70d7ab56d72

8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: 4dd89b6d86...
David Friedman [Fri, 29 Jul 2016 16:51:01 +0000 (16:51 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: 4dd89b6d86 am: c1f941e10f
am: 8aab92c727

Change-Id: I06ad82ac0175deb66e0e45b6ce15b2cce7fe2ae7

8 years agoDoc change: remove deprecated intl versions of notifications guidelines. am: 223a1727...
Dirk Dougherty [Fri, 29 Jul 2016 16:50:57 +0000 (16:50 +0000)]
Doc change: remove deprecated intl versions of notifications guidelines. am: 223a1727cc am: 8478151729 am: 68883c7a8a
am: 56f481cfa9

Change-Id: I6d34df8a17b71d1e4251800e41f9175dc19db479

8 years agoMerge changes from topic 'am-814b66751ec643389cdf20694182197c'
Android Build Merger (Role) [Fri, 29 Jul 2016 16:49:16 +0000 (16:49 +0000)]
Merge changes from topic 'am-814b66751ec643389cdf20694182197c'

* changes:
  Merge \\\"Default fingerprint swipe to disabled.\\\" into nyc-mr1-dev am: 781f4386dc am: f7f4dfea71 am: 69c6ee6331
  Default fingerprint swipe to disabled. am: d01217c0c2 am: fd8273d53d am: 9bf2c7607e

8 years agoMerge "Merge \\\"update shared libraries for system apps\\\" into nyc-mr1-dev am...
Android Build Merger (Role) [Fri, 29 Jul 2016 16:49:00 +0000 (16:49 +0000)]
Merge "Merge \\\"update shared libraries for system apps\\\" into nyc-mr1-dev am: 6cecc8dc27 am: a4bef226cc am: 5398b220b3"

8 years agoMerge "Add memory array to the default power_profile.xml"
James Carr [Fri, 29 Jul 2016 16:48:54 +0000 (16:48 +0000)]
Merge "Add memory array to the default power_profile.xml"

8 years agoMerge \\\"Default fingerprint swipe to disabled.\\\" into nyc-mr1-dev am: 781f4386dc...
Doris Ling [Fri, 29 Jul 2016 16:45:57 +0000 (16:45 +0000)]
Merge \\\"Default fingerprint swipe to disabled.\\\" into nyc-mr1-dev am: 781f4386dc am: f7f4dfea71
am: 69c6ee6331

Change-Id: I97069317642d3c63057d8b3807adaa0aa2d28c22

8 years agoDefault fingerprint swipe to disabled. am: d01217c0c2 am: fd8273d53d
Doris Ling [Fri, 29 Jul 2016 16:45:16 +0000 (16:45 +0000)]
Default fingerprint swipe to disabled. am: d01217c0c2 am: fd8273d53d
am: 9bf2c7607e

Change-Id: I78b2e8e451f9ce09f650a46e91a679a9a1b9984d

8 years agoMerge \\\"update shared libraries for system apps\\\" into nyc-mr1-dev am: 6cecc8dc27...
Todd Kennedy [Fri, 29 Jul 2016 16:45:00 +0000 (16:45 +0000)]
Merge \\\"update shared libraries for system apps\\\" into nyc-mr1-dev am: 6cecc8dc27 am: a4bef226cc
am: 5398b220b3

Change-Id: I91a575df26583156e0dc450a5d591d65051b3c71

8 years agoupdate shared libraries for system apps am: 6058df65e6 am: 9815fd3b2e
Todd Kennedy [Fri, 29 Jul 2016 16:44:53 +0000 (16:44 +0000)]
update shared libraries for system apps am: 6058df65e6 am: 9815fd3b2e
am: e4adf5e69a

Change-Id: Ibf7a521a0bc8a3f3a52fcf295e1bed79a12be661

8 years agoMerge \\\"Set secure setting when all preloaded apps are installed\\\" into nyc-mr1...
Fyodor Kupolov [Fri, 29 Jul 2016 16:44:43 +0000 (16:44 +0000)]
Merge \\\"Set secure setting when all preloaded apps are installed\\\" into nyc-mr1-dev am: 65e3c7420d am: 649620349b
am: 42bceb7cf6

Change-Id: Icea9aca479191203888b529ebbf681119f2729f5

8 years agoSet secure setting when all preloaded apps are installed am: 51ce8ee3b1 am: 65d5e75895
Fyodor Kupolov [Fri, 29 Jul 2016 16:36:30 +0000 (16:36 +0000)]
Set secure setting when all preloaded apps are installed am: 51ce8ee3b1 am: 65d5e75895
am: 892f55e7ad  -s ours

Change-Id: I36e05ae35ec1bbca9b5fc9778e111987aaf1e5c0

8 years agoDelete orig DocumentsUI.
Steve McKay [Thu, 28 Jul 2016 18:10:33 +0000 (11:10 -0700)]
Delete orig DocumentsUI.

Bug: 29224737
Change-Id: I6d6327918adba699d2ed3652bc2dbea27f872284

8 years agoMerge \\\"Relax isUserRunning check and allow in-profile calls\\\" into nyc-mr1-dev...
Makoto Onuki [Fri, 29 Jul 2016 16:12:49 +0000 (16:12 +0000)]
Merge \\\"Relax isUserRunning check and allow in-profile calls\\\" into nyc-mr1-dev am: 82c2e88890 am: a09d617e05
am: 3f0fbc4e3c

Change-Id: Icd29cd0c07e76ba3ed24cce6dc34f8775cbddd11

8 years agoRelax isUserRunning check and allow in-profile calls am: 8198deacb5 am: f29793a40c
Makoto Onuki [Fri, 29 Jul 2016 16:10:23 +0000 (16:10 +0000)]
Relax isUserRunning check and allow in-profile calls am: 8198deacb5 am: f29793a40c
am: c6a4953acf

Change-Id: I769cf8827fcc2bfbf952efb33e7529811a373a22

8 years agoMerge \\\"Drop less aggressively\\\" into nyc-mr1-dev am: abf66de147 am: 755d3c319e
John Reck [Fri, 29 Jul 2016 16:10:19 +0000 (16:10 +0000)]
Merge \\\"Drop less aggressively\\\" into nyc-mr1-dev am: abf66de147 am: 755d3c319e
am: 2461338a20

Change-Id: I62638af9b675f9cf87ecf2f3f22411fc72c71269

8 years agoDrop less aggressively am: a3d795a34a am: 62ec371a9e
John Reck [Fri, 29 Jul 2016 16:10:15 +0000 (16:10 +0000)]
Drop less aggressively am: a3d795a34a am: 62ec371a9e
am: fd6bf88724

Change-Id: I4a6bd075a1989b942c2531048d5d5335a24874f4

8 years agoFix nesting of sample XML code in complex-resources doc am: 79a5b91d0d am: d779894510...
Adam Lesinski [Fri, 29 Jul 2016 16:10:11 +0000 (16:10 +0000)]
Fix nesting of sample XML code in complex-resources doc am: 79a5b91d0d am: d779894510 am: 3a45979ab0 am: 9c8423b4bb
am: df8f53939b

Change-Id: I105ec6b3f36239d8ed9e555e979a7fe489b9ce88

8 years agoMerge \\\"Follow up for I420bee8a11d430b1e52ded050536e56a85a48800\\\" into nyc-mr1...
Jorim Jaggi [Fri, 29 Jul 2016 16:10:07 +0000 (16:10 +0000)]
Merge \\\"Follow up for I420bee8a11d430b1e52ded050536e56a85a48800\\\" into nyc-mr1-dev am: ca5310dd5f am: 77a7fea6eb
am: ce4f102e53

Change-Id: I304d6f1f7bbb7e91252e05811b784117e44b756f

8 years agoFollow up for I420bee8a11d430b1e52ded050536e56a85a48800 am: 8d4f5f52a1 am: ffb289c7b3
Jorim Jaggi [Fri, 29 Jul 2016 16:07:35 +0000 (16:07 +0000)]
Follow up for I420bee8a11d430b1e52ded050536e56a85a48800 am: 8d4f5f52a1 am: ffb289c7b3
am: f878d518c1

Change-Id: I45a3a50685cceb2c59476a236cb883846ae0f51a

8 years agoMerge \"Fix nesting of sample XML code in complex-resources doc am: 79a5b91d0d am...
Adam Lesinski [Fri, 29 Jul 2016 16:07:31 +0000 (16:07 +0000)]
Merge \"Fix nesting of sample XML code in complex-resources doc am: 79a5b91d0d am: d779894510 am: 564a534f33\" into nyc-mr1-dev-plus-aosp
am: 63736dae3e

Change-Id: I7f695c5a3354e6f303a07061d0d4634d70d45d76

8 years agoFix nesting of sample XML code in complex-resources doc am: 79a5b91d0d am: d779894510...
Adam Lesinski [Fri, 29 Jul 2016 16:07:27 +0000 (16:07 +0000)]
Fix nesting of sample XML code in complex-resources doc am: 79a5b91d0d am: d779894510 am: 564a534f33
am: a84d84f26d

Change-Id: I05e79b916b8258a2bbd5b09fcffe0d11dcb0c86f

8 years agoMerge \\"Update Priority Only defaults on Watch to not include Repeat Callers\\"...
Anthony Hugh [Fri, 29 Jul 2016 16:07:18 +0000 (16:07 +0000)]
Merge \\"Update Priority Only defaults on Watch to not include Repeat Callers\\" into cw-f-dev am: 513d3e7073
am: 47cb7c2482

Change-Id: Ic6e058cc0fab197e60ef16496fc7bab7784d8227

8 years agoUpdate Priority Only defaults on Watch to not include Repeat Callers am: c04e68f0a5
Anthony Hugh [Fri, 29 Jul 2016 16:06:46 +0000 (16:06 +0000)]
Update Priority Only defaults on Watch to not include Repeat Callers am: c04e68f0a5
am: 29bcc1067b

Change-Id: Ideb92773647a0518d637acb6f5142dc0b324b556

8 years agoMerge \\\"DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e\\\" into...
Adam Lesinski [Fri, 29 Jul 2016 16:06:41 +0000 (16:06 +0000)]
Merge \\\"DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e\\\" into nyc-mr1-dev am: 533159b4f9 am: e65da1061f
am: 297267f4f9  -s ours

Change-Id: Ic0bd531bdabb25fc2501753ac401c201aec4f97b

8 years agoMerge "fix javadoc for grantRuntimePermission"
TreeHugger Robot [Fri, 29 Jul 2016 13:35:17 +0000 (13:35 +0000)]
Merge "fix javadoc for grantRuntimePermission"

8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784...
David Friedman [Fri, 29 Jul 2016 03:47:16 +0000 (03:47 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784 am: 00f85a4794 am: acbe40ef64
am: c3ae3d1eb2

Change-Id: Ibfa25afe67d627c0ef9e5347ee3d9b2fc057eaf2

8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784...
David Friedman [Fri, 29 Jul 2016 03:41:12 +0000 (03:41 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784 am: 00f85a4794
am: acbe40ef64

Change-Id: Ic0bc264ee808f2533e959772164659bcf3381b77

8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784...
David Friedman [Fri, 29 Jul 2016 03:41:08 +0000 (03:41 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784 am: 00f85a4794
am: 3cf674ee3a

Change-Id: I39b7edf2f1bec0f97ab9c7ca7797046d575fbd15

8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784
David Friedman [Fri, 29 Jul 2016 03:36:41 +0000 (03:36 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784
am: 00f85a4794

Change-Id: I7ed512a30d481d3dfbbce9038e18567388a72a0b

8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784
David Friedman [Fri, 29 Jul 2016 03:36:39 +0000 (03:36 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am: a211850784
am: 00f85a4794

Change-Id: Ib2edb4aa67fadbd0cc535c1f587d8e567095d0d8

8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC.
David Friedman [Fri, 29 Jul 2016 03:29:23 +0000 (03:29 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.
am: a211850784

Change-Id: If4408cf7a44273320a7154c776f8385d445406dd

8 years agoDocs: Adds a redirect to allow a shorter URL for NBU page on DAC.
David Friedman [Fri, 29 Jul 2016 00:07:46 +0000 (17:07 -0700)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.

Bug: 30292533
Change-Id: Ifd9ca24804d96d0e50dd0f94a028233cc2cbca4e
(cherry picked from commit 4dd89b6d86c13f170c61ca425d22e0463a81224f)

8 years agoDO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e am: 82a4d6f93b am:...
Adam Lesinski [Fri, 29 Jul 2016 02:33:15 +0000 (02:33 +0000)]
DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e am: 82a4d6f93b am: 52d7fd62a4
am: 387c351d5a  -s ours

Change-Id: I13fa3104c114e2cb0316990db22424754cc36b00

8 years agoMerge \\\"Fix nesting of sample XML code in complex-resources doc\\\" into nyc-mr1...
Adam Lesinski [Fri, 29 Jul 2016 02:33:13 +0000 (02:33 +0000)]
Merge \\\"Fix nesting of sample XML code in complex-resources doc\\\" into nyc-mr1-dev am: c8c98ce254 am: d70b8aa35e
am: e1455eb5ff

Change-Id: I43ad798d16774555f66c809c272ac9774b2daeee

8 years agoFix nesting of sample XML code in complex-resources doc am: 4d1e2adf60 am: 6782ef9aa2
Adam Lesinski [Fri, 29 Jul 2016 02:33:10 +0000 (02:33 +0000)]
Fix nesting of sample XML code in complex-resources doc am: 4d1e2adf60 am: 6782ef9aa2
am: 4b9a4ed9a8

Change-Id: Iabf6e50f8668494cc16eadc794b6562f7b604d9c

8 years agoMerge \\\"Add support to hide LTE+ in UI.\\\" into nyc-mr1-dev am: 0a39c8f1c9 am...
Robert Greenwalt [Fri, 29 Jul 2016 02:33:06 +0000 (02:33 +0000)]
Merge \\\"Add support to hide LTE+ in UI.\\\" into nyc-mr1-dev am: 0a39c8f1c9 am: 0a8c44fa58
am: 4713272144

Change-Id: Ib528fafa792222f056d04a3039b9ddbd0515d78e

8 years agoAdd support to hide LTE+ in UI. am: 37d34ba893 am: 4dace686d9
Robert Greenwalt [Fri, 29 Jul 2016 02:33:03 +0000 (02:33 +0000)]
Add support to hide LTE+ in UI. am: 37d34ba893 am: 4dace686d9
am: 44709efc96

Change-Id: I54dd593bafc0757c759d24a15ff74ab8c2f77331

8 years agoMerge \\\"Do less work on configuration change.\\\" into nyc-mr1-dev am: aef7b7242e...
Julia Reynolds [Fri, 29 Jul 2016 02:30:16 +0000 (02:30 +0000)]
Merge \\\"Do less work on configuration change.\\\" into nyc-mr1-dev am: aef7b7242e am: c8a5f3770a
am: ae12541cae

Change-Id: I169f911155e9d0e1ba8bd89fb5fd630515879149

8 years agoDo less work on configuration change. am: 494f0dedb2 am: 333cda7967
Julia Reynolds [Fri, 29 Jul 2016 02:30:13 +0000 (02:30 +0000)]
Do less work on configuration change. am: 494f0dedb2 am: 333cda7967
am: aaf3740f19

Change-Id: I75ab0148f20ab44ce8b4975696129f487c33aaba

8 years agoMerge \\\\"docs: Relocated all intl versions of \\\\"Network Security Config\\\\...
Kevin Hufnagle [Fri, 29 Jul 2016 02:30:07 +0000 (02:30 +0000)]
Merge \\\\"docs: Relocated all intl versions of \\\\"Network Security Config\\\\"\\\\" into nyc-dev am: 7fc84dbd86 am: c89c87a041 am: 74787efa5e
am: 93c53df0ea

Change-Id: I5f7ccf8be726ed496436d9033428c29592514dda

8 years agodocs: Relocated all intl versions of \\\\"Network Security Config\\\\" am: f2934fb9d7...
Kevin Hufnagle [Fri, 29 Jul 2016 02:30:00 +0000 (02:30 +0000)]
docs: Relocated all intl versions of \\\\"Network Security Config\\\\" am: f2934fb9d7 am: 6aade81b0f am: 34f2d8949e
am: 2bfe1db245

Change-Id: I2b4d846930c62e95d37c15cd54d54149ba39eefb

8 years agoMerge \\\"docs: Relocated all intl versions of \\\"Network Security Config\\\"\\...
Kevin Hufnagle [Fri, 29 Jul 2016 02:29:55 +0000 (02:29 +0000)]
Merge \\\"docs: Relocated all intl versions of \\\"Network Security Config\\\"\\\" into nyc-dev am: 7fc84dbd86 am: c7470eae93
am: 75b68d7d28

Change-Id: I511cbc14655f0aace71814b20d1031758895aadb

8 years agodocs: Relocated all intl versions of \\\"Network Security Config\\\" am: f2934fb9d7...
Kevin Hufnagle [Fri, 29 Jul 2016 02:16:19 +0000 (02:16 +0000)]
docs: Relocated all intl versions of \\\"Network Security Config\\\" am: f2934fb9d7 am: 2a136a5305
am: 796a6dd91a

Change-Id: I612f47201e91823a0dfcfc8fa4a0bff1a2967621

8 years agoMerge \\\"Fix timeout in a test utility method\\\" into nyc-mr1-dev am: 648d3030a7...
Makoto Onuki [Fri, 29 Jul 2016 02:16:13 +0000 (02:16 +0000)]
Merge \\\"Fix timeout in a test utility method\\\" into nyc-mr1-dev am: 648d3030a7 am: 024f0f7fe3
am: 0d1bab8b44

Change-Id: I5346792a70e8e75569dba52f4b950a05b011dfef

8 years agoFix timeout in a test utility method am: a210ccfab7 am: 56542a3e1c
Makoto Onuki [Fri, 29 Jul 2016 02:16:09 +0000 (02:16 +0000)]
Fix timeout in a test utility method am: a210ccfab7 am: 56542a3e1c
am: 8cfffbbad5

Change-Id: Icb6bed68551dcbc5195dac55e06a84960b39a292

8 years agoMerge \\\"Fix CascadingMenuPopup width if background has padding DO NOT MERGE\\\...
Chris Banes [Fri, 29 Jul 2016 02:16:05 +0000 (02:16 +0000)]
Merge \\\"Fix CascadingMenuPopup width if background has padding DO NOT MERGE\\\" into nyc-mr1-dev am: 7f37f2693f am: 587b60b2ff
am: 94f5c526f6  -s ours

Change-Id: I0c43b3bc4d194ed451c0c317b48fca6d3b2b6f69

8 years agoFix CascadingMenuPopup width if background has padding DO NOT MERGE am: f9e2c1b326...
Chris Banes [Fri, 29 Jul 2016 02:16:01 +0000 (02:16 +0000)]
Fix CascadingMenuPopup width if background has padding DO NOT MERGE am: f9e2c1b326 am: be3daf6947
am: 19ce4ad1f6  -s ours

Change-Id: I54b3a18222bbc610d0063991bd48d69dcd0262f0

8 years agoDocs: Deleting the rest of the preview/ directory due to N Release migration am:...
David Friedman [Fri, 29 Jul 2016 02:07:15 +0000 (02:07 +0000)]
Docs: Deleting the rest of the preview/ directory due to N Release migration am: 66a45479e0 am: 378183607b am: 45950fa31c
am: 74bd501bd7

Change-Id: I1a1f78cf499be0e768e4e62a4e8d07b24518f35a

8 years agoDocs: Deleting the rest of the preview/ directory due to N Release migration am:...
David Friedman [Fri, 29 Jul 2016 02:07:12 +0000 (02:07 +0000)]
Docs: Deleting the rest of the preview/ directory due to N Release migration am: 66a45479e0 am: 98d26156a1
am: 0c34331727

Change-Id: Id77efce8d0ceee6bd51da68c556195f75ec241e2

8 years agoDocs: Migration of N docs to about/versions/ am: f3851c1670 am: 35207b758e am: c09ad9c70a
David Friedman [Fri, 29 Jul 2016 02:07:09 +0000 (02:07 +0000)]
Docs: Migration of N docs to about/versions/ am: f3851c1670 am: 35207b758e am: c09ad9c70a
am: 9f68ffb787

Change-Id: I141eb90e927d0a8ad75b0485db065538c7e8e5e3

8 years agoDocs: Migration of N docs to about/versions/ am: f3851c1670 am: ce885e7312
David Friedman [Fri, 29 Jul 2016 02:07:06 +0000 (02:07 +0000)]
Docs: Migration of N docs to about/versions/ am: f3851c1670 am: ce885e7312
am: ff5e44035a

Change-Id: I7fd4408191685e01b564dfccf3b80027c84427fa

8 years agoDoc change: remove notifications guidelines page and redirect to material spec. am...
Dirk Dougherty [Fri, 29 Jul 2016 02:07:03 +0000 (02:07 +0000)]
Doc change: remove notifications guidelines page and redirect to material spec. am: 9bb0869926 am: 340a59c77b am: 98fe13a4aa
am: 18fe742ee0

Change-Id: Ibde14a21bea995d01a2ae0613fe76e03a5a18646

8 years agoMerge \\\\"docs: Fixed bad link to cloud-backup training class\\\\" into nyc-docs...
Andrew Solovay [Fri, 29 Jul 2016 02:04:23 +0000 (02:04 +0000)]
Merge \\\\"docs: Fixed bad link to cloud-backup training class\\\\" into nyc-docs am: baa3c078a6 am: 3af211196d am: 7d4993d40a
am: a944d9757a

Change-Id: If9d27dbc75239243d26c7d1ba83dc93d9912d03c

8 years agodocs: Fixed bad link to cloud-backup training class am: c02411f38d am: 7e7924b074...
Andrew Solovay [Fri, 29 Jul 2016 02:04:21 +0000 (02:04 +0000)]
docs: Fixed bad link to cloud-backup training class am: c02411f38d am: 7e7924b074 am: 23fa265d60
am: b83f3f05b7

Change-Id: Id94aaca36c03b2f4846057f6301ba61ad6517ac8

8 years agoMerge \\\\"docs: Removed reference to Android Support Library\\\\" into nyc-docs...
Andrew Solovay [Fri, 29 Jul 2016 02:04:18 +0000 (02:04 +0000)]
Merge \\\\"docs: Removed reference to Android Support Library\\\\" into nyc-docs am: 2a550cfa2a am: 6a56b0579d am: 426ee58a86
am: 828ae050b4

Change-Id: I72a25a0da7056adfe36e1e9f1eecdb6dd389a563

8 years agoDoc change: remove notifications guidelines page and redirect to material spec. am...
Dirk Dougherty [Fri, 29 Jul 2016 02:04:15 +0000 (02:04 +0000)]
Doc change: remove notifications guidelines page and redirect to material spec. am: 9bb0869926 am: 340a59c77b am: 9574299cba am: d4d1939357
am: 5af88d62e3

Change-Id: I852f605122b01c2b01fcbfe39b6b59e6b5ae02fe

8 years agoMerge \\\\\"docs: Fixed bad link to cloud-backup training class\\\\\" into nyc-docs...
Andrew Solovay [Fri, 29 Jul 2016 02:04:11 +0000 (02:04 +0000)]
Merge \\\\\"docs: Fixed bad link to cloud-backup training class\\\\\" into nyc-docs am: baa3c078a6 am: 3af211196d am: cc5bf6902b am: 64fd02c931
am: f36c88690d

Change-Id: I3c0f540a838a0cec51487db89e60d0484de9c596

8 years agodocs: Fixed bad link to cloud-backup training class am: c02411f38d am: 7e7924b074...
Andrew Solovay [Fri, 29 Jul 2016 02:01:41 +0000 (02:01 +0000)]
docs: Fixed bad link to cloud-backup training class am: c02411f38d am: 7e7924b074 am: a0f7338634 am: 0fb2ddcc2d
am: f34f9f4e88

Change-Id: I7eb6730c33c1d252e0726a753c4cddaf9d34e0b2

8 years agoMerge \\\\\"docs: Removed reference to Android Support Library\\\\\" into nyc-docs...
Andrew Solovay [Fri, 29 Jul 2016 02:01:37 +0000 (02:01 +0000)]
Merge \\\\\"docs: Removed reference to Android Support Library\\\\\" into nyc-docs am: 2a550cfa2a am: 6a56b0579d am: 8fb893e96c am: 8f6e247913
am: 88d66ab512

Change-Id: I3cdcf5b1ce2cef332fbed2ab67f9b7977eb76ee0

8 years agoMerge \\\\"docs: Moving localized versions of N Preview docs\\\\" into nyc-dev am...
Andrew Solovay [Fri, 29 Jul 2016 02:01:34 +0000 (02:01 +0000)]
Merge \\\\"docs: Moving localized versions of N Preview docs\\\\" into nyc-dev am: a15c0c2902 am: c9b1903d84 am: e13ba26571
am: ad9d82cb9e

Change-Id: I5107db916c57b29170205c296fef7d5bb8c07639

8 years agodocs: Moving localized versions of N Preview docs am: 32845b1eb9 am: 7b0845fea6 am...
Andrew Solovay [Fri, 29 Jul 2016 02:01:32 +0000 (02:01 +0000)]
docs: Moving localized versions of N Preview docs am: 32845b1eb9 am: 7b0845fea6 am: 9371b0d8eb
am: c803f978ea

Change-Id: I245983c8e7eccc4e2bc125b974c4a55ab076d831

8 years agoMerge \\\\"resolve merge conflicts of 07fe016 to nyc-dev\\\\" into nyc-dev am: ed49ee...
Andrew Solovay [Fri, 29 Jul 2016 02:01:29 +0000 (02:01 +0000)]
Merge \\\\"resolve merge conflicts of 07fe016 to nyc-dev\\\\" into nyc-dev am: ed49ee64f0 am: 52d5b382ee am: f0ca1c16d7
am: 9eb9279039

Change-Id: I59a5cf7f45fcc27c3e74aca32ce39641408964d4

8 years agoresolve merge conflicts of 07fe016 to nyc-dev am: 0f9a790e0f am: 19747cb135 am: c03ee...
Andrew Solovay [Fri, 29 Jul 2016 01:59:00 +0000 (01:59 +0000)]
resolve merge conflicts of 07fe016 to nyc-dev am: 0f9a790e0f am: 19747cb135 am: c03ee73ec2
am: 3f61437646

Change-Id: I6d2832773b741faa5c51f2a3a2e713991aed4bbf

8 years agoMerge \\\\"docs: Moving L10N versions of Scoped Dir Access docs\\\\" into nyc-dev...
Dan Yu [Fri, 29 Jul 2016 01:58:56 +0000 (01:58 +0000)]
Merge \\\\"docs: Moving L10N versions of Scoped Dir Access docs\\\\" into nyc-dev am: 2c77170adb am: 90a2ba89b1 am: 3d75f7fd97
am: a7a1038b4e

Change-Id: I9ac1178971e4bba7fa6b0cd99e351c7b943172b7

8 years agodocs: Moving L10N versions of Scoped Dir Access docs am: a4fc4209c8 am: c4d1f7a35e...
Daniel Yu [Fri, 29 Jul 2016 01:58:53 +0000 (01:58 +0000)]
docs: Moving L10N versions of Scoped Dir Access docs am: a4fc4209c8 am: c4d1f7a35e am: 05fdf9b85c
am: e8ff6f9cff

Change-Id: Ic8a30d972e89a3f7ed7fa1710ab00e1cf28f6ec6

8 years agoMerge \\\\"docs: Moving L10N versions of TV recording API docs\\\\" into nyc-dev...
Dan Yu [Fri, 29 Jul 2016 01:58:50 +0000 (01:58 +0000)]
Merge \\\\"docs: Moving L10N versions of TV recording API docs\\\\" into nyc-dev am: ee7fa57ea6 am: 1f8b805f14 am: 1a286210d0
am: 6d32002122

Change-Id: I01c7c8ae8220d38601c5366310e87fb96ed9acb4

8 years agodocs: Moving L10N versions of TV recording API docs am: a93eeaa38b am: 1e255933da...
Daniel Yu [Fri, 29 Jul 2016 01:58:46 +0000 (01:58 +0000)]
docs: Moving L10N versions of TV recording API docs am: a93eeaa38b am: 1e255933da am: 95af3c40fc
am: aabb5d1a45

Change-Id: I0a4fca3c7fb24fa74b23588f729c453b49965029

8 years agoMerge \\\\"docs: Moving L10N versions of Direct Boot docs\\\\" into nyc-dev am: 3744b...
Dan Yu [Fri, 29 Jul 2016 01:56:08 +0000 (01:56 +0000)]
Merge \\\\"docs: Moving L10N versions of Direct Boot docs\\\\" into nyc-dev am: 3744b05b0e am: fa70537cd6 am: 1ae6dfc6ad
am: 4b679a6015

Change-Id: Ie6be994c6fcd09bfa5a1a569aaaf63d9de721805

8 years agodocs: Moving L10N versions of Direct Boot docs am: 9bd8e969da am: 6ee0a29bc8 am:...
Daniel Yu [Fri, 29 Jul 2016 01:56:05 +0000 (01:56 +0000)]
docs: Moving L10N versions of Direct Boot docs am: 9bd8e969da am: 6ee0a29bc8 am: 61db5264db
am: 0759bf9bbc

Change-Id: Ic1c9dcf106d9bcd3c0889caa117213dc035d68ac

8 years agoMerge \\\\"docs: Moving L10N versions of PIP docs\\\\" into nyc-dev am: 1f33503861...
Dan Yu [Fri, 29 Jul 2016 01:56:02 +0000 (01:56 +0000)]
Merge \\\\"docs: Moving L10N versions of PIP docs\\\\" into nyc-dev am: 1f33503861 am: 67da26112f am: dc218c8fcb
am: 2991330ce0

Change-Id: I908ffef880efea527a0119dc954b8a45adc13fb7

8 years agodocs: Moving L10N versions of PIP docs am: 089055f18c am: b3d4a4003a am: 82f3ec0d6e
Daniel Yu [Fri, 29 Jul 2016 01:55:59 +0000 (01:55 +0000)]
docs: Moving L10N versions of PIP docs am: 089055f18c am: b3d4a4003a am: 82f3ec0d6e
am: 85cb2e2082

Change-Id: I5044805409edeb435efff10049f37cb9d3d0e5d4