Oren Blasberg
a86d1e0b59
Merge "Accommodate NaN in new context menu methods." into nyc-dev
2016-04-26 22:41:01 +00:00
Oren Blasberg
0967da3989
Merge "Don't show icons for top level menus unless forced." into nyc-dev
2016-04-26 22:38:58 +00:00
Chris Craik
e98a046d31
Fix oval positioning when drawn with patheffect
...
Fixes: 28396277
Change-Id: I9e21696d81d7cd219f3eaa081bf3d9ba988fe051
2016-04-26 15:38:33 -07:00
Shreyas Basarge
8fcf6a6922
Merge "Account info on job wakelocks" into nyc-dev
2016-04-26 22:36:47 +00:00
Cheryl Potter
5fc7099e1e
docs: Polish Android Monitor pages
...
b/26279420
Change-Id: Ic2ccf9510f51adeb843f7aff9197d59e7a532fe2
2016-04-26 15:36:41 -07:00
Hangyu Kuang
54ac219184
Revert "Revert "Hook up HDR capabilities from native SurfaceControl""
...
This reverts commit 2c38f45f27
2016-04-26 22:24:23 +00:00
Cheryl Potter
cde0435f26
Merge "Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs am: cffbbc8 am: 8af8d4d am: 13308fc2 am: 39579d7" into nyc-dev
...
am: 5475c95
2016-04-26 22:21:21 +00:00
smain@google.com
ab120c9534
Merge "Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am: b9709f6 am: c4ec690 am: 73b5cc9" into nyc-dev
...
am: 359b10d
2016-04-26 22:21:19 +00:00
smain@google.com
46d699409f
Merge "change Mac JDK requirement to 6 am: 611a2f4 am: 3b1f66c am: 0619ef2" into nyc-dev
...
am: 3b93446
2016-04-26 22:21:14 +00:00
Adarsh Fernando
4d5833a774
Merge "Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am: 3dbc405 am: 6eed040 am: f654443" into nyc-dev
...
am: c5f684f
2016-04-26 22:21:08 +00:00
Adarsh Fernando
e0d51990b0
Merge "Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am: b896cd1 am: abb5afc am: fe47b6d" into nyc-dev
...
am: 7a82b58
2016-04-26 22:21:01 +00:00
Adarsh Fernando
c3cdc28f61
Merge "Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am: 7961413 am: 88d1e91 am: 8776f89" into nyc-dev
...
am: b14b1fd
2016-04-26 22:20:52 +00:00
Dirk Dougherty
a5c1203ebc
Merge "Update studio landing page and add all-new install flow docs. bug: 27850063 (update system reqs for 2.0) bug: 27725026 (update download page for 2.0) bug: 23908299 (clean up download and get started) am: 9577d31 am: fc35cf2 am: 478463a" into nyc-dev
...
am: da816e8
2016-04-26 22:20:42 +00:00
Kevin Hufnagle
ceb47d040f
Merge "Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am: 7c909cc am: 090e5fb am: 5f6a355" into nyc-dev
...
am: 5a073da
2016-04-26 22:20:28 +00:00
sreevanis
389cff3507
Merge "Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am: 63f15a9 am: e7b8c79 am: 29c6f81 am: 26ed50a" into nyc-dev
...
am: 239d2c2
2016-04-26 22:19:56 +00:00
Deepanshu Gupta
a43c4fa09f
Add namespace before attr name in defPropMap
...
Change-Id: I36d094fb69d5f5ce0aebde04960ffcd19c27a2eb
2016-04-26 15:19:31 -07:00
Chad Brubaker
e1807559dc
Merge "Merge "Add missing </pin-set>" into mnc-mr-docs am: 5f415c2 am: 0ed59f9 am: f1ac8fa" into nyc-dev
...
am: 9dd786c
2016-04-26 22:18:59 +00:00
Antonio Cansado
3e883daeef
Fixing network tags.
...
- History was not populating the tag, so all of them appeared as tag 0x0.
Bug: 28345240
Change-Id: I9c898695bbe8d18531f7ea432ebb8f02d72e5d27
2016-04-26 22:18:52 +00:00
Chad Brubaker
0400a2fba1
Merge "Merge "Fix application manifest XML" into mnc-mr-docs am: c8dcc2b am: 3fdc800 am: fc688ec" into nyc-dev
...
am: c41d003
* commit 'c41d00358c3d54407dbd09dc80a2721449459337':
Change-Id: Id715a64a856413dee350a8c9935efaa7e487dd80
2016-04-26 22:18:38 +00:00
Joe Fernandez
3f7c5f6605
Merge "Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am: 4ec3749 am: 83113d6 am: 824429f" into nyc-dev
...
am: 124260f
2016-04-26 22:18:17 +00:00
Andrew Solovay
4ef5f59c33
Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am: 242f06cd am: 0015bf0 am: bb64fe3" into nyc-dev
...
am: 641fbbd
2016-04-26 22:17:56 +00:00
Dirk Dougherty
cc01f7d6f5
Merge "Merge "Updates for Play." into mnc-mr-docs am: 3afd52a am: f4658e2 am: ab3721a" into nyc-dev
...
am: 8b10dd2
2016-04-26 22:17:34 +00:00
Daniel Yu
5dc8236610
Merge "Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am: cac018b am: 9e16ddc am: 461e731" into nyc-dev
...
am: ae9e686
2016-04-26 22:17:13 +00:00
Kevin Hufnagle
12ed73e49c
Merge "Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am: 2f5a204 am: ddbf8d2c am: f63a1c4" into nyc-dev
...
am: df5e147
2016-04-26 22:16:38 +00:00
Kevin Hufnagle
6592605932
Merge "Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am: f380435 am: 0da507d am: 7f0d4d0" into nyc-dev
...
am: d3ca191
2016-04-26 22:15:22 +00:00
Kevin Hufnagle
30588d9e0f
Merge "Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am: c9afecd am: 1c076e8 am: 8d336e6" into nyc-dev
...
am: a743567
2016-04-26 22:14:53 +00:00
Kevin Hufnagle
3f65c1578f
Merge "Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am: 9deafe5 am: fcf68ef am: c56d885" into nyc-dev
...
am: 96eaf3e
2016-04-26 22:14:24 +00:00
Kevin Hufnagle
46582a26a0
Merge "Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am: 88e19d1 am: 2d9cc0f am: a732be1" into nyc-dev
...
am: f49f8ee
2016-04-26 22:13:54 +00:00
Kevin Hufnagle
985388b820
Merge "Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am: 8ea3fd8 am: f1cb86cc am: 690cba0" into nyc-dev
...
am: ebb60eb
2016-04-26 22:13:15 +00:00
Kevin Hufnagle
171a1c2546
Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev
...
* changes:
Merge "docs: Added section describing Launcher Shortcuts." into mnc-mr-docs am: 9d4afa9ecb8164a6d7a32dd4cc3b584d18b40ed41b2f24634cabbf5c36a9dcc77ca18294fa255859daf357fd9ff6e2ff842e57e4b3931a0a4ff0d46f3e94f7ecbd6ce1ad5d64bdbfb0c6b93a91333f241dd67e559a5988079d9cea553ae5760c615f4bb936516bd5c3da572a3a9938f2b6c5079b2e4bcfd78fab383c8d5021800bef2890c65f6783df78bad64df51dd1d69b7271b30208ffb094d16c507d8a7a91d34432873db9afaa37dd29e5cbba2414150fa49d235ecb082f2ebdbd2a9b10e3e10717c9e9b15e566c9beb0ccc39e60e315f2a8f838dbdfc4027d32297c36d3
2016-04-26 22:11:40 +00:00
Joe Fernandez
0277e454d1
Merge "Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am: 42a3312 am: faa815d am: 2ca2a2c" into nyc-dev
...
am: 57add8c
2016-04-26 22:11:40 +00:00
Andrew Solovay
0b998730a2
Merge "docs: Added link to "preparing for multiwindow" blog post am: d93472b am: 5db4e1f am: 04b4190" into nyc-dev
...
am: 63791f2
* commit '63791f213149e5a57e6f5ca3f4d348797931bd3d':
Change-Id: Ic8f32a9b2095e0195c26341c1df9834c68de9bc7
2016-04-26 22:11:02 +00:00
Kevin Hufnagle
7659acc0e7
Merge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into mnc-ub-dev
...
* changes:
Merge "docs: Enhanced description of "direct reply" workflow." into mnc-mr-docs am: 4a17d8fa9738fe5f8bdb91ccba99f2e37da9dc17617037a86acb8d48464d3d669f2abac79b6ecfc7b97bc3cada00e6f90e021c306de5da7101d30637ceca137ba3c057a084e109fab6d36223fac5016887bce49ce84d9ce6d683d280202c0a1b59e1bd7c1b4194c1e6d00f00594e52372112afe1452c8798a02c0f5b6b18e7a6e43bc90f38d77a4db69f6e5b3aa606f
2016-04-26 22:10:42 +00:00
Andrew Solovay
6496a039bc
Merge "Merge "docs: Clarified how multi-window applies to activities in task stack" into mnc-mr-docs am: a23e28f am: fbb8b65 am: 3832614" into nyc-dev
...
am: 376b149
2016-04-26 22:10:26 +00:00
Elliot Waite
d15b5fcd40
Merge "Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am: abb9f4d am: fe0cc90 am: e8b402e" into nyc-dev
...
am: be3f2de
2016-04-26 22:09:49 +00:00
Miao Wang
6321c9858d
Merge "Merge "[RenderScript] Update documentation about API level and RS Support Lib." into mnc-mr-docs am: f2988f5 am: 2291d03 am: 25570d5" into nyc-dev
...
am: f11c479
2016-04-26 22:08:06 +00:00
sreevanis
9f6bbfda94
Merge "Merge "cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support." into mnc-mr-docs am: f70f0f4 am: 9f57db1 am: cedb262" into nyc-dev
...
am: d942882
2016-04-26 22:07:22 +00:00
sreevanis
4cfa7ee14d
Merge "Merge "docs: Updated API changes for Dinar wearable support." into mnc-docs am: 71b1f0b -s ours am: a6d7166 am: 0446ed4 am: f786db7" into nyc-dev
...
am: 4da53c0
2016-04-26 22:06:37 +00:00
Ruben Brunk
f84b3e0e2f
Merge "Add manifest attribute for VR activities." into nyc-dev
2016-04-26 22:05:30 +00:00
smain@google.com
bb8bb25367
Merge "simplification and clarification to the Studio Overview am: e9b3ada am: f1a5076 am: 1f8be54" into nyc-dev
...
am: 07773c7
2016-04-26 22:05:06 +00:00
smain@google.com
bf7a6fa8f6
Merge "Merge "improved structure and organization between video and training docs on the Training landing page." into mnc-mr-docs am: 49b17d3 am: 30c61f9 am: 07bfe29" into nyc-dev
...
am: 2b0a5c9
2016-04-26 22:03:59 +00:00
Android Build Merger (Role)
5475c951bc
Merge "Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs am: cffbbc8 am: 8af8d4d am: 13308fc2 am: 39579d7" into nyc-dev
2016-04-26 21:58:53 +00:00
Android Build Merger (Role)
359b10d739
Merge "Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am: b9709f6 am: c4ec690 am: 73b5cc9" into nyc-dev
2016-04-26 21:58:43 +00:00
Android Build Merger (Role)
3b934467d4
Merge "change Mac JDK requirement to 6 am: 611a2f4 am: 3b1f66c am: 0619ef2" into nyc-dev
2016-04-26 21:58:33 +00:00
Android Build Merger (Role)
c5f684f6f7
Merge "Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am: 3dbc405 am: 6eed040 am: f654443" into nyc-dev
2016-04-26 21:58:22 +00:00
Android Build Merger (Role)
7a82b58a8a
Merge "Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am: b896cd1 am: abb5afc am: fe47b6d" into nyc-dev
2016-04-26 21:58:11 +00:00
Android Build Merger (Role)
b14b1fd9fa
Merge "Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am: 7961413 am: 88d1e91 am: 8776f89" into nyc-dev
2016-04-26 21:58:03 +00:00
Android Build Merger (Role)
da816e80bc
Merge "Update studio landing page and add all-new install flow docs. bug: 27850063 (update system reqs for 2.0) bug: 27725026 (update download page for 2.0) bug: 23908299 (clean up download and get started) am: 9577d31 am: fc35cf2 am: 478463a" into nyc-dev
2016-04-26 21:57:53 +00:00
Android Build Merger (Role)
5a073da32b
Merge "Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am: 7c909cc am: 090e5fb am: 5f6a355" into nyc-dev
2016-04-26 21:57:42 +00:00
Android Build Merger (Role)
239d2c2ea2
Merge "Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am: 63f15a9 am: e7b8c79 am: 29c6f81 am: 26ed50a" into nyc-dev
2016-04-26 21:57:32 +00:00
