OSDN Git Service
John Reck [Wed, 27 Apr 2016 14:36:51 +0000 (14:36 +0000)]
Merge "API tweaks to PixelCopy and make it public" into nyc-dev
Julia Reynolds [Wed, 27 Apr 2016 12:59:03 +0000 (12:59 +0000)]
Merge "More bugreport logging for scheduleconditionprovider." into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 11:02:49 +0000 (11:02 +0000)]
Merge "Fix infinite loop during package-usage.list file upgrade" into nyc-dev
Erik Kline [Wed, 27 Apr 2016 09:40:06 +0000 (09:40 +0000)]
Merge "IpManager: add a provisioning timeout option" into nyc-dev
David Brazdil [Wed, 27 Apr 2016 09:35:56 +0000 (10:35 +0100)]
Fix infinite loop during package-usage.list file upgrade
When upgrading from version 0 to version 1 of the file
'/data/system/package-usage.list', the PackageManagerService can get
stuck in an infinite loop if one of the listed packages does not
exist, e.g. because it had been uninstalled. Fix the issue by
refactoring the loop.
Bug:
28409278
Change-Id: Ia312bd0d04f696240445b710dd6a68b93c5d5946
Seigo Nonaka [Wed, 27 Apr 2016 07:32:44 +0000 (16:32 +0900)]
Fix unexpected null check condition flipping.
With I5a40675dd226564c0ee190d0d6f7eb2a7e4673b0, isNull() is used for
null check but accidentally the condition is flipped.
Bug:
28406262
Change-Id: I776a6c259765210a7b334a81876233b594fd25ed
Erik Kline [Tue, 26 Apr 2016 02:48:09 +0000 (11:48 +0900)]
IpManager: add a provisioning timeout option
Relatedly: remove the provisioning timeout from DhcpClient.
Bug:
17733693
Bug:
24837343
Change-Id: I6d5b835b4ca70ba6fd06df359fc2128a0df46252
Svet Ganov [Wed, 27 Apr 2016 06:05:31 +0000 (23:05 -0700)]
Add a missing null check
We no longer have a null settings value - instead it is a
null object. This change adds a missing null check that is
not changed to check against the null object.
bug:
28406262
Change-Id: I5a40675dd226564c0ee190d0d6f7eb2a7e4673b0
Andrew Solovay [Wed, 27 Apr 2016 05:44:24 +0000 (05:44 +0000)]
doc: Removed duplicate card from distribute/users page am:
5ecc2aaee8 am:
2a7de38
am:
80b5d84
* commit '
80b5d84dcd816d7a132ee20dbc98677ff818c35f':
doc: Removed duplicate card from distribute/users page
Change-Id: I1800f2b42f5af02006d07b7b64fa1197a289da96
Scott Rowe [Wed, 27 Apr 2016 05:44:02 +0000 (05:44 +0000)]
Merge "docs: 3 additional review criteria for Android TV" into mnc-mr-docs am:
88e0bbce56 am:
1eb657a
am:
9e1a923
* commit '
9e1a9233215b21785b07a753c13ec8eed851d0e8':
docs: 3 additional review criteria for Android TV
Change-Id: I8d17d44886ea71fc11d6f8c3c03c3dc938c50b92
David Friedman [Wed, 27 Apr 2016 05:43:19 +0000 (05:43 +0000)]
Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs. am:
0e7bc1b215 am:
f829492
am:
0811472
* commit '
0811472a36c7b18635654e97866c406aab587e89':
Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs.
Change-Id: I50f0e413de828bd4aa61dadd462e525e00dcf659
David Friedman [Wed, 27 Apr 2016 05:42:07 +0000 (05:42 +0000)]
Merge "Docs: Localized DAC pages for N Preview." into mnc-mr-docs am:
e20502c240 am:
1c2ce95
am:
25a92f0
* commit '
25a92f0762ea5fc1e60f00b6f7634ffccc8265cd':
Docs: Localized DAC pages for N Preview.
Change-Id: I6bc25875398fbad13821095a5e0115969620fcdb
Cheryl Potter [Wed, 27 Apr 2016 05:41:44 +0000 (05:41 +0000)]
Merge "docs: Small edits to Vector Asset Studio Support Library support b/
28199128" into mnc-mr-docs am:
0a67c6a am:
b8f834d
am:
1f48ddb
* commit '
1f48ddb1902764bdcbd4eb885a25a1c8c5897a34':
docs: Small edits to Vector Asset Studio Support Library support b/
28199128
Change-Id: I4fdd22938e8e4443b3d69fc4173aac3824d83ce4
Daniel Yu [Wed, 27 Apr 2016 05:41:21 +0000 (05:41 +0000)]
Merge "docs: Fixing various minor issues" into mnc-mr-docs am:
9780f94 am:
cf35d40
am:
d563c25
* commit '
d563c253911b5ad86804b474acbc931d27572d2a':
docs: Fixing various minor issues
Change-Id: Ied80c3fc5cbe1af6fce8a006af698170601bf292
Kevin Hufnagle [Wed, 27 Apr 2016 05:40:59 +0000 (05:40 +0000)]
Merge "docs: [Revert] Improved description of "package" attribute (manifest)." into mnc-mr-docs am:
fa8847d am:
ee3411d
am:
0e5d260
* commit '
0e5d260ae793a42efc974c0674a530f808d7f05a':
docs: [Revert] Improved description of "package" attribute (manifest).
Change-Id: I336b8fa0787934813004b8c3b322a408635c6c87
Cheryl Potter [Wed, 27 Apr 2016 05:40:37 +0000 (05:40 +0000)]
docs: Remove banned deep link term from release notes b/
28153615 am:
0489fe9 am:
6e09530
am:
d88a3ca
* commit '
d88a3caddb34aed7bef5a7d01f62164eacbcbbb0':
docs: Remove banned deep link term from release notes b/
28153615
Change-Id: Ibdf8a433c31d8487d1319ff61912baacc0500e3e
Kevin Hufnagle [Wed, 27 Apr 2016 05:40:13 +0000 (05:40 +0000)]
Merge "docs: Improved description of "package" attribute (manifest)." into mnc-mr-docs am:
190bf3b943 am:
19db30b
am:
7e8840d
* commit '
7e8840dec7879e2973ebf1e09c74a482c1ee8651':
docs: Improved description of "package" attribute (manifest).
Change-Id: I8ea2623afea04cc3f5c5b9550fc66cb42d79a5d2
Kevin Hufnagle [Wed, 27 Apr 2016 05:39:08 +0000 (05:39 +0000)]
Merge "docs: Clarified purpose of application "name" attr within manifest." into mnc-mr-docs am:
c3500321cd am:
c9c3ad8
am:
3c8a59f
* commit '
3c8a59fc25e7d1bd777f15ef9712696b341e2a49':
docs: Clarified purpose of application "name" attr within manifest.
Change-Id: Ic8bb4cc1edbbef00d06d030e1cdae215ceb9d2e5
Adarsh Fernando [Wed, 27 Apr 2016 05:38:04 +0000 (05:38 +0000)]
Merge "Docs: Background optimizations \'foreground\' -> \'running app\' fix." into mnc-mr-docs am:
df0509bce1 am:
86efe43
am:
016500b
* commit '
016500bd5850869db649abe616ab327118b843d9':
Docs: Background optimizations 'foreground' -> 'running app' fix.
Change-Id: I90a096de57b9591304623a9713d2ef103c814290
Kevin Hufnagle [Wed, 27 Apr 2016 05:24:42 +0000 (05:24 +0000)]
Merge "resolve merge conflicts of
70adfe3 to nyc-dev" into nyc-dev
Jeff Tinker [Wed, 27 Apr 2016 05:21:47 +0000 (05:21 +0000)]
Merge "Remove MediaDrm stack from mediaserver" into nyc-dev
Kevin Hufnagle [Wed, 27 Apr 2016 05:14:38 +0000 (22:14 -0700)]
resolve merge conflicts of
70adfe3 to nyc-dev
Change-Id: I0dbd35b74a8cc1427258b4066d759a6861faba8f
Cheryl Potter [Wed, 27 Apr 2016 04:31:04 +0000 (04:31 +0000)]
Merge "docs: Attach debugger to process 2.0 update and corrections" into mnc-mr-docs am:
97f8b66 am:
b7b1e22
am:
93c7630
* commit '
93c7630146507e1c828361d7a90fd1b8e22487da':
docs: Attach debugger to process 2.0 update and corrections
Change-Id: I1f4ee7ea866b76c3702c06b73ca96cb724e17b44
Amanda Kassay [Wed, 27 Apr 2016 04:30:36 +0000 (04:30 +0000)]
Merge "Copied over redirects from mnc-mr-docs/vendor/google/docs/app-engine-server/v4/redirects.yaml b/
27314537" into mnc-mr-docs am:
0050cd7 am:
bb0a302
am:
8306431
* commit '
83064319b2d925c052513f1b19b22fd65f9d47f7':
Copied over redirects from mnc-mr-docs/vendor/google/docs/app-engine-server/v4/redirects.yaml b/
27314537
Change-Id: I1be69f55016dc8902726a3b5d6e9fae6c598ba0c
Ryan Seys [Wed, 27 Apr 2016 04:30:00 +0000 (04:30 +0000)]
Merge "Fix a couple typos and clarify UI requirements for banner images" into mnc-mr-docs am:
7c9712b am:
97c3608
am:
cef06ba
* commit '
cef06ba4ed9dde6c51f96f3d0c246c530c175ca3':
Fix a couple typos and clarify UI requirements for banner images
Change-Id: Id67c91f881ab919d1428849102e4946ff0042530
Cheryl Potter [Wed, 27 Apr 2016 04:28:09 +0000 (04:28 +0000)]
Merge "docs: Remove unsupported emulator features and refer users to Android Emulator b/
28070270" into mnc-mr-docs am:
5f57a68 am:
fa6e4eb
am:
bbb15ba
* commit '
bbb15bab85c1583912bb7b9d630512a3d98a05d7':
docs: Remove unsupported emulator features and refer users to Android Emulator b/
28070270
Change-Id: I3029969ef1a147699644f2b87604eb9cf249e47e
Andrew Solovay [Wed, 27 Apr 2016 04:27:35 +0000 (04:27 +0000)]
docs: Adding "OEM Unlock" issue to DP2 Release Notes am:
80d04a7 am:
ee1ecbb
am:
8278d99
* commit '
8278d999c2d1edb6be9e0c5217fd030a4f8cbbce':
docs: Adding "OEM Unlock" issue to DP2 Release Notes
Change-Id: I3625aeaf5f2f2850b9420fcc1e0e6c7692ef7ea1
Adarsh Fernando [Wed, 27 Apr 2016 04:27:04 +0000 (04:27 +0000)]
Merge "Docs: Fixed refrences of 65K -> 64K" into mnc-mr-docs am:
1938352 am:
99f3f9c
am:
a7905c2
* commit '
a7905c2cc4c2da88c5f3c3f52e02347bf60e7a25':
Docs: Fixed refrences of 65K -> 64K
Change-Id: I549efee1802f1e4106323f55249280e75f1c62a6
Cheryl Potter [Wed, 27 Apr 2016 04:26:30 +0000 (04:26 +0000)]
Merge "docs: Vector Asset Studio support for Support Library in AS 2.0 b/
26949405" into mnc-mr-docs am:
90518c7 am:
d726826
am:
33351ef
* commit '
33351ef5e564d0751698d8c2ebab1ad9a5bf052e':
docs: Vector Asset Studio support for Support Library in AS 2.0 b/
26949405
Change-Id: I5e4de173c25eeb3701f2dcb7f37d849bc9815443
David Friedman [Wed, 27 Apr 2016 04:24:55 +0000 (04:24 +0000)]
Merge "Docs: Adds Vulkan-related KIs to the N-DP2 "Support and Release Notes" page." into mnc-mr-docs am:
863db15 am:
dd3abf8
am:
1561e33
* commit '
1561e331167223b3c631508fb3d14fb590e55554':
Docs: Adds Vulkan-related KIs to the N-DP2 "Support and Release Notes" page.
Change-Id: I5e68b81a32beef3c5fbddd89b24c825d11a2ab2d
Cheryl Potter [Wed, 27 Apr 2016 04:24:02 +0000 (04:24 +0000)]
Merge "docs: Update Lint instructions for Android Studio b/
26627201 b/
26987391" into mnc-mr-docs am:
517ea98 am:
22be914
am:
56e4b32
* commit '
56e4b32a121259a20dfbaf7077e69bcd8f52dcb0':
docs: Update Lint instructions for Android Studio b/
26627201 b/
26987391
Change-Id: I1f1639789a89b8f268e5c62d3436d735a0830346
Cheryl Potter [Wed, 27 Apr 2016 04:23:28 +0000 (04:23 +0000)]
Merge "docs: Fix multi-touch doc b/
28163832" into mnc-mr-docs am:
e42d550 am:
1ab0f3f
am:
f2b790c
* commit '
f2b790ce99455538727d957ad9100326e39aa3d9':
docs: Fix multi-touch doc b/
28163832
Change-Id: Icc4e6264bd69f3aebc6747888e85c56d7f4b9a6a
Andrew Solovay [Wed, 27 Apr 2016 04:22:51 +0000 (04:22 +0000)]
Merge "docs: Android for Work updates to DP2 Release Notes" into mnc-mr-docs am:
86bcabf am:
59b5161
am:
087a37f
* commit '
087a37f433c606bea80338d2bcd57f48073bb71b':
docs: Android for Work updates to DP2 Release Notes
Change-Id: Iaa87037b9ece35a5901246b0cc3abea4bebfef57
Adarsh Fernando [Wed, 27 Apr 2016 04:21:30 +0000 (04:21 +0000)]
Merge "Docs: Updated Jack/J8 doc for DP2" into mnc-mr-docs am:
ed6921b am:
be83917
am:
7ac2c21
* commit '
7ac2c2164d2498b8b4d451cda7ce0cedb4a6e1fd':
Docs: Updated Jack/J8 doc for DP2
Change-Id: Icaaedaf9fb3db8b422a8db187d7ad64acf0bf518
Winson Chung [Wed, 27 Apr 2016 04:02:09 +0000 (04:02 +0000)]
Merge "Mark header bar buttons as clickable only when they are made visible." into nyc-dev
Joe Fernandez [Wed, 27 Apr 2016 03:46:54 +0000 (03:46 +0000)]
docs: Fixes for DP2 docs am:
1271b6e am:
4e3fbe8
am:
46e8c2a
* commit '
46e8c2af79fe3699bd22398f6f4611907d8cebf8':
docs: Fixes for DP2 docs
Change-Id: I33a14dc06cce2a66de7774adee42dfafe00ad51f
David Friedman [Wed, 27 Apr 2016 03:46:12 +0000 (03:46 +0000)]
Docs: Updates NDK TOC to include new Vulkan pages. am:
1ab34c0 am:
2e1974c
am:
75b3275
* commit '
75b32758d1bc8a62966edb9596e8e23bc0291394':
Docs: Updates NDK TOC to include new Vulkan pages.
Change-Id: I253aab51457b12328a3010055da8a32f4db57efe
Joe Fernandez [Wed, 27 Apr 2016 03:45:19 +0000 (03:45 +0000)]
docs: N Developer Preview 2 downloads am:
922b5e4 am:
6ef51c6
am:
b14ac73
* commit '
b14ac736d0e4822d383feeed405cc6f2735bfeba':
docs: N Developer Preview 2 downloads
Change-Id: I0ecae4c9c02e956a711cc5c6d8359e712c6f8787
Andrew Solovay [Wed, 27 Apr 2016 03:43:36 +0000 (03:43 +0000)]
Merge "docs: Continuing work on the N DP2 release notes." into mnc-mr-docs am:
cd40b61 am:
c308aa4
am:
b9d7f7d
* commit '
b9d7f7d52c2e091138c8d4edf6ec40a64519e069':
docs: Continuing work on the N DP2 release notes.
Change-Id: I1853d8776e478ad7c9abf4064de20ad824aa3a2c
Andrew Solovay [Wed, 27 Apr 2016 03:42:45 +0000 (03:42 +0000)]
docs: Continuing work on the N DP2 API Overview. am:
f5266e5 am:
ef86375
am:
3d3af77
* commit '
3d3af778f84769c82e4c603fd30fccb60296b9e8':
docs: Continuing work on the N DP2 API Overview.
Change-Id: Ifea3883e6e2337f1272dd55671899766f072514c
David Friedman [Wed, 27 Apr 2016 03:42:06 +0000 (03:42 +0000)]
Merge "Docs: Updates NDK samples page and Vulkan landing page for launch." into mnc-docs am:
a5f673f am:
9da6e91 am:
1373b2e
am:
2fec99b
* commit '
2fec99b8407d2e1a09aa2b77c9bd47b565c8d033':
Docs: Updates NDK samples page and Vulkan landing page for launch.
Change-Id: I0c532f572f2cb7be667fdfd5e05e30ddeb351915
David Friedman [Wed, 27 Apr 2016 03:40:19 +0000 (03:40 +0000)]
Merge "Docs: Adding shader-compiler documentation to initial Vulkan doc set." into mnc-docs am:
f0bc99f am:
4f3ab05 am:
76c9370
am:
d2e09b1
* commit '
d2e09b1e8fdbb3a6f3964e4dbb64d3d614f25629':
Docs: Adding shader-compiler documentation to initial Vulkan doc set.
Change-Id: I8746ebaa8c196db00243fb8c599c70408c60d215
David Friedman [Wed, 27 Apr 2016 03:39:22 +0000 (03:39 +0000)]
Merge "Docs: Adds validation-layer material to new Vulkan doc set" into mnc-docs am:
b94ea2c am:
d3867e5 am:
6adbc4d
am:
5c58a99
* commit '
5c58a99dd314e3078400e9178916b68eca451220':
Docs: Adds validation-layer material to new Vulkan doc set
Change-Id: I541213ffdf3341133973de6b82e6365d455e2132
David Friedman [Wed, 27 Apr 2016 03:38:35 +0000 (03:38 +0000)]
Merge "Docs: Vulkan Design Guidelines for Vulkan launch." into mnc-docs am:
65a8bce am:
9ac0752 am:
808053b
am:
3b930e1
* commit '
3b930e1a57c70b27ec271f2f120144d4aa90b44f':
Docs: Vulkan Design Guidelines for Vulkan launch.
Change-Id: Ide711b56df5fc5982454defafdabf0c9a55c68e2
David Friedman [Wed, 27 Apr 2016 03:36:16 +0000 (03:36 +0000)]
Docs: Getting Started guide for Vulkan on Android am:
a357c3f am:
0603232 am:
82c23f1
am:
9e0af78
* commit '
9e0af78ee6b4be14a1d7b17dd38f2e53749c5f54':
Docs: Getting Started guide for Vulkan on Android
Change-Id: I7c5ad257fb7560b8f41374761fe0e349aee651ca
Bert McMeen [Wed, 27 Apr 2016 03:35:17 +0000 (03:35 +0000)]
Merge "Docs: Correction to service node snippet of manifest file" into mnc-mr-docs am:
4fb6ada am:
650a59a
am:
7308200
* commit '
7308200268ac856874195f2f264c8d5f4aac7462':
Docs: Correction to service node snippet of manifest file
Change-Id: I27b3a19a3103f8fd3375d6832c77ac31ff186d27
Dan Albert [Wed, 27 Apr 2016 03:34:25 +0000 (03:34 +0000)]
Merge "Don\'t mention armeabi-v7a-hard." into mnc-mr-docs am:
77f3538 am:
5931efc
am:
5bb86e5
* commit '
5bb86e5876297637e9e4ccff57dd90f9e9e1eb48':
Don't mention armeabi-v7a-hard.
Change-Id: Ia281b63a37c6de1876b9c4afd7d20fadb50a0302
Kevin Hufnagle [Wed, 27 Apr 2016 03:32:17 +0000 (03:32 +0000)]
Merge "docs: Enhanced description of "direct reply" workflow." into mnc-mr-docs am:
4a17d8f am:
a9738fe
am:
2df35b5
* commit '
2df35b5df3a2cbbfaa9d95a29d25d2c0ff903109':
docs: Enhanced description of "direct reply" workflow.
Change-Id: I3f9d9c050f4a78fece003b7ec003eda92cc1a291
Andrew Solovay [Wed, 27 Apr 2016 03:31:24 +0000 (03:31 +0000)]
Merge "doc: Update N Preview release notes for DP2." into mnc-mr-docs am:
5f8bdb9 am:
1ccba99
am:
d187ca2
* commit '
d187ca23db5285931072c877d31a20ad774990c2':
doc: Update N Preview release notes for DP2.
Change-Id: Ia0f974ecbfb1dd04f78277b1a049fe18ba8d0e99
Andrew Solovay [Wed, 27 Apr 2016 03:30:37 +0000 (03:30 +0000)]
Merge "docs: Updates to API Overview for N Preview 2" into mnc-mr-docs am:
f2e37da am:
9dc1761
am:
c107b105
* commit '
c107b105177fb690124114dcbec5eaf74ac2420f':
docs: Updates to API Overview for N Preview 2
Change-Id: I32322c35ef47c9abf2e277c886b854e0bf153ee5
Andrew Solovay [Wed, 27 Apr 2016 03:28:25 +0000 (03:28 +0000)]
docs: Updating Android for Work N Preview page for DP2. am:
7037a86 am:
acb8d48
am:
8e16fb7
* commit '
8e16fb7f0c9d38bca69023920f495a2cbcae39eb':
docs: Updating Android for Work N Preview page for DP2.
Change-Id: I7d7b460c7383c93676e90fdcc8518f5e90a0b827
Kevin Hufnagle [Wed, 27 Apr 2016 03:27:33 +0000 (03:27 +0000)]
Merge "docs: Fixed "known issues" link." into mnc-mr-docs am:
464d3d6 am:
69f2aba
am:
d8ba760
* commit '
d8ba760cae2881a790960f82f15cf5a858af21e9':
docs: Fixed "known issues" link.
Change-Id: Id841835687bfa42c546763f3501a3857190a7f84
David Friedman [Wed, 27 Apr 2016 03:26:41 +0000 (03:26 +0000)]
Merge "Docs: Behavior Changes doc for N Developer Preview 2" into mnc-mr-docs am:
c79b6ec am:
fc7b97b
am:
38e6a81
* commit '
38e6a81e73af42960fb4801955b0065752f2ab3c':
Docs: Behavior Changes doc for N Developer Preview 2
Change-Id: I209ec9d5a7980f8189e65192e2e712996414b004
Kevin Hufnagle [Wed, 27 Apr 2016 03:24:31 +0000 (03:24 +0000)]
Merge "docs: Clarified structure of security config file." into mnc-mr-docs am:
c3cada0 am:
0e6f90e
am:
d893d0c
* commit '
d893d0c5c4dacc702c2bcbc84b2d6f93ed36fef7':
docs: Clarified structure of security config file.
Change-Id: I4b0b6116cce7f5504d916e87875607c30db9acdd
Dan Albert [Wed, 27 Apr 2016 03:23:35 +0000 (03:23 +0000)]
Merge "Word the section about libc++ more strongly." into mnc-mr-docs am:
021c306 am:
de5da71
am:
c1877e7
* commit '
c1877e7d7b283af7f580aca191598db0a5ba4db9':
Word the section about libc++ more strongly.
Change-Id: Ic8625b4bc8115af6bb4e5419781d7dd69f11c5fb
smain@google.com [Wed, 27 Apr 2016 03:22:32 +0000 (03:22 +0000)]
Merge "new doc about shrinking code and resources (massive re-write of proguard doc). bug:
27746083" into mnc-mr-docs am:
01d3063 am:
7ceca13
am:
71ecff1
* commit '
71ecff1aadc0732d108f57d42fc9cb75a37af88b':
new doc about shrinking code and resources (massive re-write of proguard doc). bug:
27746083
Change-Id: Ie57e24a2e3c31555c89bbb3b7732ca2a146be94c
Kevin Hufnagle [Wed, 27 Apr 2016 03:20:24 +0000 (03:20 +0000)]
Merge "docs: Added resource card to AdMob Ads page in DAC" into mnc-mr-docs am:
7ba3c05 am:
7a084e1
am:
2a7830e
* commit '
2a7830e7e335a2defca490fee7da398f2f64804b':
docs: Added resource card to AdMob Ads page in DAC
Change-Id: Id31a276d6ab9b16d808278c498d041de6954ecdf
Kevin Hufnagle [Wed, 27 Apr 2016 03:19:28 +0000 (03:19 +0000)]
Merge "docs: Fixed capitalization error in method name." into mnc-mr-docs am:
09fab6d am:
36223fa
am:
552a3eb
* commit '
552a3eb8573c29bbedf0d454ef0808457f4198d2':
docs: Fixed capitalization error in method name.
Change-Id: I3b41d333c983d3ee0d5189af41d9d13ff26b412f
Kevin Hufnagle [Wed, 27 Apr 2016 03:17:35 +0000 (03:17 +0000)]
Merge "docs: Updated link, wording associated with data-sharing IPC." into mnc-mr-docs am:
c501688 am:
7bce49c
am:
31d841c
* commit '
31d841c9373214ece6dd27fedcf512471f12f1dc':
docs: Updated link, wording associated with data-sharing IPC.
Change-Id: I82032bb7d831f436e8d05a16ab93aa27c3f660ef
Kevin Hufnagle [Wed, 27 Apr 2016 03:16:14 +0000 (03:16 +0000)]
Merge "docs: Fixed "APK signature scheme v2" link in N API Overview." into mnc-mr-docs am:
e84d9ce am:
6d683d2
am:
ed0adf4
* commit '
ed0adf4bcae744b36f0e616bfc1806b7097da042':
docs: Fixed "APK signature scheme v2" link in N API Overview.
Change-Id: Ic9b75c23b7d75a7417f33280171e6160f2507d66
Adarsh Fernando [Wed, 27 Apr 2016 03:15:16 +0000 (03:15 +0000)]
Merge "Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links." into mnc-mr-docs am:
80202c0 am:
a1b59e1
am:
ad68538
* commit '
ad68538160c7a0ce6cb74ca3dfbb7b0789e4a3c7':
Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links.
Change-Id: I635232489bc55ccf6f19c7f7c242999e792d8781
Andrew Solovay [Wed, 27 Apr 2016 03:13:00 +0000 (03:13 +0000)]
Merge "docs: Updates to Multi-Window/PiP APIs for Preview 2" into mnc-mr-docs am:
bd7c1b4 am:
194c1e6
am:
c9344c3
* commit '
c9344c3e17be681f94bed55c91d52112e7a23a92':
docs: Updates to Multi-Window/PiP APIs for Preview 2
Change-Id: Ib00de3d02a9aefd8bbb702f6ca9153b408acec21
Joe Fernandez [Wed, 27 Apr 2016 03:11:53 +0000 (03:11 +0000)]
Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am:
d00f005 am:
94e5237
am:
b79b808
* commit '
b79b80882c34f0c540e84c7a3a90b73c617e0635':
docs: InfoPros, Project 02, Batch 03
Change-Id: Iccf5c61e7c9a7da81d8df114076a94a86983e247
Jesse Hall [Wed, 27 Apr 2016 03:09:25 +0000 (03:09 +0000)]
docs: Remove texture compression formats that don\'t exist am:
2112afe am:
8d949de
am:
54bf946
* commit '
54bf9464697af53381af5bf8f980f3a3336b4369':
docs: Remove texture compression formats that don't exist
Change-Id: I9b572855315a34db894dfea4ae808769890c97df
Mary Yanchar [Wed, 27 Apr 2016 03:08:12 +0000 (03:08 +0000)]
Merge "Clarified how to regenerate debug.keystore" into mnc-mr-docs am:
1452c87 am:
98a02c0
am:
33b03ae
* commit '
33b03aea27af14f6dce4fa535a0d68995dd9a32e':
Clarified how to regenerate debug.keystore
Change-Id: I389e9f6eab9eabeb4d4d9b9fbfe2ec32234c46b6
Andreas Gampe [Wed, 27 Apr 2016 03:04:27 +0000 (03:04 +0000)]
Merge "Frameworks/base: Add compiled-classes" into nyc-dev
Rob Carr [Wed, 27 Apr 2016 02:53:23 +0000 (02:53 +0000)]
Merge "Clear opaque flag when surface insets change." into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:39:39 +0000 (02:39 +0000)]
Merge "Merge "docs: Updating PIP N preview docs for DP2" into mnc-mr-docs am:
f5b6b18 am:
e7a6e43 am:
da62a9e" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:39:30 +0000 (02:39 +0000)]
Merge "Merge "docs: Updating Scoped Directory Access preview docs for DP2" into mnc-mr-docs am:
bc90f38 am:
d77a4db am:
4f4d8cc" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:39:20 +0000 (02:39 +0000)]
Merge "Merge "docs: Updating Direct Boot N preview docs for DP2" into mnc-mr-docs am:
69f6e5b am:
3aa606f am:
02dc9a8" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:39:11 +0000 (02:39 +0000)]
Merge "Merge "docs: Added section describing Launcher Shortcuts." into mnc-mr-docs am:
9d4afa9 am:
ecb8164 am:
2bf8de2" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:39:02 +0000 (02:39 +0000)]
Merge "Merge "docs: Document test artifact preference setting b/
24810371" into mnc-mr-docs am:
a6d7a32 am:
dd4cc3b am:
18ec09c" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:38:53 +0000 (02:38 +0000)]
Merge "add 64-bit requirement for linux bug:
26288626 am:
584d18b am:
40ed41b am:
affdf51" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:38:43 +0000 (02:38 +0000)]
Merge "Merge "Removed mention of JRE8 in sdk setup" into mnc-mr-docs am:
2f24634 am:
cabbf5c3 am:
5855008" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:38:34 +0000 (02:38 +0000)]
Merge "Merge "update system reqs for accelerated emulator bug:
27817059" into mnc-mr-docs am:
69c05a7 am:
6a9dcc7 am:
e76837d" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:38:25 +0000 (02:38 +0000)]
Merge "There is no GCC 4.6. am:
7ca1829 am:
4fa2558 am:
f6a93e5" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:38:16 +0000 (02:38 +0000)]
Merge "Remove obsolete note about libatomic. am:
59daf35 am:
7fd9ff6 am:
72ef5fc" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:38:07 +0000 (02:38 +0000)]
Merge "Remove an obsolete paragraph. am:
e2ff842 am:
e57e4b3 am:
e81002b" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:37:57 +0000 (02:37 +0000)]
Merge "Remove an out of date detail. am:
931a0a4 am:
ff0d46f am:
1a6768d" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:37:45 +0000 (02:37 +0000)]
Merge "Fix case of libc++. am:
3e94f7e am:
cbd6ce1 am:
b67649e" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:37:36 +0000 (02:37 +0000)]
Merge "Merge "Fix typo." into mnc-mr-docs am:
ad5d64b am:
dbfb0c6 am:
4b0dce4" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:37:27 +0000 (02:37 +0000)]
Merge "Merge "docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/
28075206" into mnc-docs am:
b93a913 am:
33f241d am:
d67e559 am:
3e59527" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:37:17 +0000 (02:37 +0000)]
Merge "Merge "Docs: minor AS 2.0 related fixes" into mnc-mr-docs am:
a598807 am:
9d9cea5 am:
583d485" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:37:09 +0000 (02:37 +0000)]
Merge "Merge "docs: Document test artifact preference setting b/
24810371" into mnc-docs am:
53ae576 -s ours am:
0c615f4 am:
bb93651 am:
2269a11" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:36:59 +0000 (02:36 +0000)]
Merge "Merge "Docs: Minor fixes to Background Optimizations and Doze docs" into mnc-mr-docs am:
6bd5c3d am:
a572a3a am:
d7f4b76" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:36:49 +0000 (02:36 +0000)]
Merge "URLs are hard, Mr. Eason. am:
9938f2b am:
6c5079b am:
d4a4f43" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:36:40 +0000 (02:36 +0000)]
Merge "add studio 2.0 blog post to the "latest" feed for studio landing page am:
2e4bcfd am:
78fab38 am:
03a2876" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:36:31 +0000 (02:36 +0000)]
Merge "delete irrelevant manifest documentation am:
3c8d502 am:
1800bef am:
19319de" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:36:21 +0000 (02:36 +0000)]
Merge "Merge "make hero header and image link to download studio" into mnc-mr-docs am:
2890c65 am:
f6783df am:
07868c9" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:36:11 +0000 (02:36 +0000)]
Merge "Merge "Docs: Added image for CTL config" into mnc-mr-docs am:
78bad64 am:
df51dd1 am:
d20b4cb" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:36:00 +0000 (02:36 +0000)]
Merge "add notice about compatiblity with N Preview (bug:
27830549) improve linux 32-bit library information (bug:
27962189), add a note about JDK 8 compatibility on Mac, and a few other edits to installation guide and system reqs. am:
d69b727 am:
1b30208 am:
663ad9c" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:35:51 +0000 (02:35 +0000)]
Merge "Merge "Docs: Added release notes for SDK Tools 25.0.0" into mnc-mr-docs am:
ffb094d am:
16c507d am:
c4870e5" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:35:42 +0000 (02:35 +0000)]
Merge "Merge "Add 2.0 download file names, sizes, sums" into mnc-mr-docs am:
8a7a91d am:
3443287 am:
572c804" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:35:33 +0000 (02:35 +0000)]
Merge "Merge "docs: Updated support library release notes for 23.3.0" into mnc-mr-docs am:
3db9afa am:
a37dd29 am:
4aff1c1" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:35:24 +0000 (02:35 +0000)]
Merge "Merge "add instructions to change Android SDK location when using N Preview bug:
28017690" into mnc-mr-docs am:
e5cbba2 am:
414150f am:
4b63685" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:35:15 +0000 (02:35 +0000)]
Merge "Merge "Docs: Added AS 2.0 Release Notes" into mnc-mr-docs am:
a49d235 am:
ecb082f am:
453e69c" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 02:35:05 +0000 (02:35 +0000)]
Merge "Merge "docs: Data Binding 2.0 updates b/
26892478" into mnc-docs am:
2ebdbd2 am:
a9b10e3 am:
e10717c am:
e493677" into nyc-dev
Daniel Yu [Wed, 27 Apr 2016 02:30:53 +0000 (02:30 +0000)]
Merge "docs: Updating PIP N preview docs for DP2" into mnc-mr-docs am:
f5b6b18 am:
e7a6e43
am:
da62a9e
* commit '
da62a9e12bac8bfa62bc09fcca50da22adc51254':
docs: Updating PIP N preview docs for DP2
Change-Id: Id255066d9e7969c69d77e5f3d7b694994d314316
Daniel Yu [Wed, 27 Apr 2016 02:28:47 +0000 (02:28 +0000)]
Merge "docs: Updating Scoped Directory Access preview docs for DP2" into mnc-mr-docs am:
bc90f38 am:
d77a4db
am:
4f4d8cc
* commit '
4f4d8cc8535ac2f5ba3cd56773641f257ccb359f':
docs: Updating Scoped Directory Access preview docs for DP2
Change-Id: Ic1198bd31c8978b0220a97b28f399ff0a08abd32
Daniel Yu [Wed, 27 Apr 2016 02:27:30 +0000 (02:27 +0000)]
Merge "docs: Updating Direct Boot N preview docs for DP2" into mnc-mr-docs am:
69f6e5b am:
3aa606f
am:
02dc9a8
* commit '
02dc9a8617a19ee2fe1207b76f6172494ad12cb9':
docs: Updating Direct Boot N preview docs for DP2
Change-Id: I44e03eefae179fd5b1fdcca48439e99c14ca496d
OSDN Git Service
