OSDN Git Service
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 21 Jul 2016 23:07:15 +0000 (23:07 +0000)]
Merge "docs: Replacing curly apostrophes with straight ones" into nyc-docs
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
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
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
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
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
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
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
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
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
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
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
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
Sreevani Sreejith [Thu, 21 Jul 2016 20:24:50 +0000 (20:24 +0000)]
Merge "docs: Fixed typo." into mnc-io-docs
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
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
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
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
David Gross [Thu, 21 Jul 2016 16:15:37 +0000 (16:15 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup."
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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)
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
TreeHugger Robot [Thu, 21 Jul 2016 04:02:06 +0000 (04:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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
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
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
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
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
Bill Yi [Thu, 21 Jul 2016 03:39:59 +0000 (03:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
c1079364cb -s ours
Change-Id: I7abd0a0cce9a39061be91be90e26585f2bb5f5a4
Bill Yi [Thu, 21 Jul 2016 03:39:55 +0000 (03:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
60858a45cd -s ours
Change-Id: I2b913190f77c1351e1b776f2bb319d550af309e3
Bill Yi [Thu, 21 Jul 2016 03:39:51 +0000 (03:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
db89342ec6 -s ours
Change-Id: I5ee9264a116ad1ebd0b5b6d305e10fa3a1c3a77a
Bill Yi [Thu, 21 Jul 2016 03:39:48 +0000 (03:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
a9a03b5d7e -s ours
Change-Id: I54902004b078c6596c43eb0d35bf8376b6c7f11a
Bill Yi [Thu, 21 Jul 2016 03:39:44 +0000 (03:39 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
98e71028c7 -s ours
Change-Id: I55b989091dad00ec6a9380f9b59f42be8d716d76
TreeHugger Robot [Thu, 21 Jul 2016 03:33:19 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:33:10 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:50 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:42 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:19 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:32:00 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:51 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:31 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:23 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 21 Jul 2016 03:31:01 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 21 Jul 2016 02:38:44 +0000 (19:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: If251730b4f9eb5fb6f9e0ce7fd2e675adb73862e
Auto-generated-cl: translation import
Matthew Fritze [Thu, 21 Jul 2016 01:24:02 +0000 (01:24 +0000)]
Merge \"Revert \"Revert \"Error colors to point to frameworks rather than hard-code them\"\"\" into nyc-mr1-dev
am:
9e7bd8de87
Change-Id: Ie9d9f4864c0e85375dace272cb9e389b3f02c573
Matthew Fritze [Thu, 21 Jul 2016 01:06:10 +0000 (01:06 +0000)]
Merge \"Revert \"Error colors to point to frameworks rather than hard-code them\"\" into nyc-mr1-dev
am:
22d09743d8
Change-Id: If9113aab011035227930b2df6b68341ee3774bd3
Matthew Fritze [Thu, 21 Jul 2016 01:04:23 +0000 (01:04 +0000)]
Merge "Revert "Revert "Error colors to point to frameworks rather than hard-code them""" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 00:59:33 +0000 (00:59 +0000)]
Revert "Revert "Error colors to point to frameworks rather than hard-code them""
This reverts commit
7c11e933d540b27d596a1536ffbb75007e24a7e6.
Change-Id: I79ecbc39a78f17d22ec20097cfba213de5e30b5e
Andrew Sapperstein [Thu, 21 Jul 2016 00:57:01 +0000 (00:57 +0000)]
Merge "Revert "Error colors to point to frameworks rather than hard-code them"" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 00:55:53 +0000 (00:55 +0000)]
Revert "Error colors to point to frameworks rather than hard-code them"
This reverts commit
43f762a0263b7da464c29c139fa6bfc91ec1713d.
Change-Id: If328c2e6983a2dd2295d83f17edbaaa3cc149b60
Chris Craik [Thu, 21 Jul 2016 00:39:44 +0000 (00:39 +0000)]
Merge \"Change swap chain stuffed detection logic\" into nyc-mr1-dev
am:
433a19e8bf
Change-Id: I6942a7cef5c831a1be3ee0252c2f475594f3db39
Amith Yamasani [Thu, 21 Jul 2016 00:30:26 +0000 (00:30 +0000)]
Merge \"Allow calling in demo mode\" into nyc-mr1-dev
am:
8c8d752851
Change-Id: I484fb7003f4a3f4ab967d19fc761973eb0c6c233
Chris Craik [Thu, 21 Jul 2016 00:26:14 +0000 (00:26 +0000)]
Merge "Change swap chain stuffed detection logic" into nyc-mr1-dev
Amith Yamasani [Thu, 21 Jul 2016 00:21:12 +0000 (00:21 +0000)]
Merge "Allow calling in demo mode" into nyc-mr1-dev
Matthew Fritze [Wed, 20 Jul 2016 23:47:23 +0000 (23:47 +0000)]
Merge \"Error colors to point to frameworks rather than hard-code them\" into nyc-mr1-dev
am:
948400a43d
Change-Id: Ibeca72659bbd13b1a5a8bdb009fc6a5021f8acbf
Chris Craik [Wed, 20 Jul 2016 00:59:12 +0000 (17:59 -0700)]
Change swap chain stuffed detection logic
bug:
29771461
bug:
29413700
bug:
30181577
Changes frame interval gap detection to look for wider gaps, as they
were incorrectly firing all the time.
Also adds a 500ms minimum gap between frames dropped because of stuffed
swap chain, to prevent dropping too often.
Change-Id: If16ed637d54bf37015704be102c5c2e3731a0824
Adrian Roos [Wed, 20 Jul 2016 23:41:14 +0000 (23:41 +0000)]
Merge \"Direct Reply: Allow closing IME separately from DirectReply mode\" into nyc-mr1-dev
am:
01acf40e0f
Change-Id: I0d38aca1c53c31e54819979eafd2f2dc37b2071a
Matthew Fritze [Wed, 20 Jul 2016 23:34:40 +0000 (23:34 +0000)]
Merge "Error colors to point to frameworks rather than hard-code them" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 23:29:17 +0000 (23:29 +0000)]
Merge "Direct Reply: Allow closing IME separately from DirectReply mode" into nyc-mr1-dev
Doris Liu [Wed, 20 Jul 2016 23:15:43 +0000 (23:15 +0000)]
Merge \"Fix VD animator not being properly resumed\" into nyc-mr1-dev
am:
ffa880b83f
Change-Id: Ie10f5c12f528fb3d07765d724ee2a59138863906
Michael Kwan [Wed, 20 Jul 2016 23:15:33 +0000 (23:15 +0000)]
Merge \"Fix crash on devices with 1.2\" screens.\" into nyc-mr1-dev
am:
70a789f569
Change-Id: I18e99a65c5a8aeafe75f2a872ac39c8a4ac4f5a4
Doris Liu [Wed, 20 Jul 2016 23:10:52 +0000 (23:10 +0000)]
Merge "Fix VD animator not being properly resumed" into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 23:09:55 +0000 (23:09 +0000)]
Merge \"Support multiple intents in ShortcutInfo\" into nyc-mr1-dev
am:
b84ce2e034
Change-Id: I53daa680bdf18505896a372e59c7b4bd73d4edca
Chris Thornton [Wed, 20 Jul 2016 23:09:42 +0000 (23:09 +0000)]
Merge \"SoundTriggerHelpoer: Send pause events on abort if a model is running.\" into nyc-mr1-dev
am:
d661476c98
Change-Id: Ie470d782d3e16a440c345a444d4eb29cebec34b4
Michael Kwan [Wed, 20 Jul 2016 23:08:04 +0000 (23:08 +0000)]
Merge "Fix crash on devices with 1.2" screens." into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 23:05:29 +0000 (23:05 +0000)]
Merge "Support multiple intents in ShortcutInfo" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 23:05:20 +0000 (23:05 +0000)]
Merge "SoundTriggerHelpoer: Send pause events on abort if a model is running." into nyc-mr1-dev
David Gross [Wed, 20 Jul 2016 23:04:35 +0000 (16:04 -0700)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
Substantive changes:
- Add discussion of reduction kernels.
- Use RS_KERNEL in place of __attribute__((kernel)).
- Discuss "context" special argument.
- Special arguments x, y, z may be of type int.
- Discuss multiple inputs for mapping kernels.
- Mention that script-side global writes are not visible in Java.
- Rewrite part of discussion regarding when to use support library.
- Change minimum device version for support library from Android 2.2 (API level 8)
to Android 2.3 (API level 9).
Stylistic changes (better conformance with style guide):
- Proper use of <i> (italic) versus <em> (emphasis).
- Proper case for headings.
- Proper pattern for Android version numbers.
- Do not use e.g. or i.e.
- Prefer active rather than passive voice.
- Prefer present rather than future tense.
Miscellaneous minor editorial changes.
Bug:
27299393
Bug:
30000147
Change-Id: Ie0a26152714cf8f619d4914218f7262d675bb25f
Christopher Tate [Wed, 20 Jul 2016 22:58:03 +0000 (22:58 +0000)]
Merge \"Run the SELinux wallpaper restorecon operations on all users\" into nyc-mr1-dev
am:
bf9fa8280e
Change-Id: I06a8e2f5510f019f6c553a7b26ce602a690f9732
Chris Tate [Wed, 20 Jul 2016 22:45:10 +0000 (22:45 +0000)]
Merge "Run the SELinux wallpaper restorecon operations on all users" into nyc-mr1-dev
Bill Yi [Wed, 20 Jul 2016 22:23:45 +0000 (15:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibefe0963160a02bc49c36a2511d5c3f72f8078c2
Auto-generated-cl: translation import
Bill Yi [Wed, 20 Jul 2016 22:18:26 +0000 (15:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8b102a4e41d6b25a88ae261313fc46f2781451e
Auto-generated-cl: translation import
Billy Lamberta [Wed, 20 Jul 2016 22:15:57 +0000 (22:15 +0000)]
docs: work - Managed configuration bundles
am:
ef57498142
Change-Id: I6186c90e5d7125d678db5c876dc47697e14e60d7
OSDN Git Service
