OSDN Git Service
Daichi Hirono [Wed, 27 Apr 2016 01:31:48 +0000 (01:31 +0000)]
Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev
am:
e597323
* commit '
e597323939c85f1e7e32272250b790e4d9e234e6':
Terminate DocumentsUI opened for the specific root.
Change-Id: I7fca164e3191ee9ae4ea622cbf77dfcb700db358
smain@google.com [Wed, 27 Apr 2016 01:31:46 +0000 (01:31 +0000)]
Merge "resolve merge conflicts of
886bbdb to nyc-dev" into nyc-dev
am:
2d22afc
* commit '
2d22afc3a19353cc9d574c7ffb2a96b2b34eb70b':
docs: Emulator 25.0.10 docs for AS 2.0 release b/
24816712
Change-Id: Iba427084a395801cac7ce4cb851de07758b60b75
Tomasz Mikolajewski [Wed, 27 Apr 2016 01:31:43 +0000 (01:31 +0000)]
Merge "Exclude virtual files from ACTION_SEND." into nyc-dev
am:
b56bc29
* commit '
b56bc29657c3de0d957ec01c1c8e959d7354ea2d':
Exclude virtual files from ACTION_SEND.
Change-Id: I1d1742aacb8cc19a36d8cc9c89a0441dc4ac7a1c
Chong Zhang [Wed, 27 Apr 2016 01:31:38 +0000 (01:31 +0000)]
Merge "Finish immediately if the resumed activity is already visible" into nyc-dev
am:
08eb8a1
* commit '
08eb8a1aa2384883fd1bb0b60d3b49c4c72c3143':
Finish immediately if the resumed activity is already visible
Change-Id: Ic5f470ff4bad25149b76e8d04eebf66a4b7afbb7
TreeHugger Robot [Wed, 27 Apr 2016 01:18:42 +0000 (01:18 +0000)]
Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev
Scott Main [Wed, 27 Apr 2016 01:11:18 +0000 (01:11 +0000)]
Merge "resolve merge conflicts of
886bbdb to nyc-dev" into nyc-dev
Tomasz Mikolajewski [Wed, 27 Apr 2016 01:11:02 +0000 (01:11 +0000)]
Merge "Exclude virtual files from ACTION_SEND." into nyc-dev
smain@google.com [Wed, 27 Apr 2016 01:09:06 +0000 (18:09 -0700)]
resolve merge conflicts of
886bbdb to nyc-dev
Change-Id: Ib6a009d086ff9f4c3a568124170cd6203f1b385b
Chong Zhang [Wed, 27 Apr 2016 01:08:15 +0000 (01:08 +0000)]
Merge "Finish immediately if the resumed activity is already visible" into nyc-dev
Todd Kennedy [Wed, 27 Apr 2016 00:58:47 +0000 (00:58 +0000)]
Merge "Don\'t override pre-release target sdk" into nyc-dev
am:
97ef0e7
* commit '
97ef0e77afa3be6255b70c8567843ac298386251':
Don't override pre-release target sdk
Change-Id: Ib70b0e908dc148799875afcedeeb1d59f2d90367
Robert Carr [Wed, 27 Apr 2016 00:54:54 +0000 (00:54 +0000)]
Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
am:
69a6fe3
* commit '
69a6fe321c7b3934ee8849d2038a85443011050c':
Fix bugs with takeSurface and preserveWindows.
Change-Id: I6f7b52b3d880eede508c12f8d2ffa1c29f17bbd5
TreeHugger Robot [Wed, 27 Apr 2016 00:53:17 +0000 (00:53 +0000)]
Merge "Don't override pre-release target sdk" into nyc-dev
Adarsh Fernando [Wed, 27 Apr 2016 00:48:18 +0000 (00:48 +0000)]
Merge "Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am:
e60e315 am:
f2a8f83 am:
86eb9f3" into nyc-dev
am:
7f17d27
* commit '
7f17d27e8922382c32f53924f59842714da03729':
Docs: Minor edit to IR docs to mention longer intial/clean builds
Change-Id: I10885b9ebe03feb656461ded00c0f8799884c5a7
Jeff Sharkey [Wed, 27 Apr 2016 00:48:13 +0000 (00:48 +0000)]
Merge "Fix two multi-user bugs in package upgrade." into nyc-dev
am:
fc5f6e6
* commit '
fc5f6e6c80954c837a98d963789f6a30f3b87ad1':
Fix two multi-user bugs in package upgrade.
Change-Id: I395320fa5b22daa6d63d8f89e5fcc53d252ade21
Rob Carr [Wed, 27 Apr 2016 00:47:57 +0000 (00:47 +0000)]
Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 00:43:23 +0000 (00:43 +0000)]
Merge "Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am:
e60e315 am:
f2a8f83 am:
86eb9f3" into nyc-dev
Adarsh Fernando [Wed, 27 Apr 2016 00:40:09 +0000 (00:40 +0000)]
Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am:
e60e315 am:
f2a8f83
am:
86eb9f3
* commit '
86eb9f3770faf3fbae439d583db31a5055a06625':
Docs: Minor edit to IR docs to mention longer intial/clean builds
Change-Id: I52767d1d4a5b0421611056747f0f8bb41c548ae7
TreeHugger Robot [Wed, 27 Apr 2016 00:39:40 +0000 (00:39 +0000)]
Merge "Fix two multi-user bugs in package upgrade." into nyc-dev
Kenji Sugimoto [Wed, 27 Apr 2016 00:36:30 +0000 (00:36 +0000)]
Merge "Set installed flag of all users if system app is installed later" into nyc-dev
am:
e542e0c
* commit '
e542e0cb9b2fbde1cfa7ff36af9cd370af459a49':
Set installed flag of all users if system app is installed later
Change-Id: I259dff95f457dadc3912603df4f9ea7e975e410a
Tomasz Mikolajewski [Wed, 27 Apr 2016 00:36:27 +0000 (00:36 +0000)]
Merge "Fix index computation for quick viewing." into nyc-dev
am:
52036c7
* commit '
52036c743c1fccf004247af35e9c95e12fb0a638':
Fix index computation for quick viewing.
Change-Id: I25b1c61ee8b162221020f10a2f1dfd4e9e8562c9
Robert Carr [Wed, 27 Apr 2016 00:36:23 +0000 (00:36 +0000)]
Merge "Touch region fixes for dialogs and overlapping tasks." into nyc-dev
am:
4f40766
* commit '
4f40766360fd9f2459e9fc4d30119bec95c2cf48':
Touch region fixes for dialogs and overlapping tasks.
Change-Id: If7ff395ee0fecd7e5ce8b7d31a9f42bffcd4bad6
Cheryl Potter [Wed, 27 Apr 2016 00:36:19 +0000 (00:36 +0000)]
resolve merge conflicts of
946609b to nyc-dev
am:
49d7803
* commit '
49d7803f046e8e71a473ff1a096ab1e1d6969bcc':
docs: AVD Manager docs for AS 2.0 b/
26907919
Change-Id: Ic6596e94afa44e5afbf7aeed644b8f5571d5fd7f
TreeHugger Robot [Wed, 27 Apr 2016 00:32:39 +0000 (00:32 +0000)]
Merge "Set installed flag of all users if system app is installed later" into nyc-dev
Tomasz Mikolajewski [Wed, 27 Apr 2016 00:30:45 +0000 (00:30 +0000)]
Merge "Fix index computation for quick viewing." into nyc-dev
Rob Carr [Wed, 27 Apr 2016 00:29:58 +0000 (00:29 +0000)]
Merge "Touch region fixes for dialogs and overlapping tasks." into nyc-dev
smain@google.com [Wed, 27 Apr 2016 00:25:09 +0000 (17:25 -0700)]
resolve merge conflicts of
946609b to nyc-dev
Change-Id: Ic96e9e78d16255bfd2fc43df5180c2b1a766ea2d
Tomasz Mikolajewski [Wed, 27 Apr 2016 00:09:10 +0000 (00:09 +0000)]
Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev
am:
ee6d8be
* commit '
ee6d8be53e1dabf7669150e7e7e39daa58cac542':
Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."
Change-Id: I62bb1b479d521b24d1cf1ef05675ba887973867b
Chong Zhang [Wed, 27 Apr 2016 00:09:08 +0000 (00:09 +0000)]
Merge "Request a wallpaper update pass when wallpaper target is set to visible" into nyc-dev
am:
b60a830
* commit '
b60a830f8b192eadb6c94bdef99967cc2cddafff':
Request a wallpaper update pass when wallpaper target is set to visible
Change-Id: I8d09e5cc9023f26ae947d3b9cf7e49a08e026738
Chong Zhang [Wed, 27 Apr 2016 00:09:05 +0000 (00:09 +0000)]
Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev
am:
83c4135
* commit '
83c4135a3a50c50890c52d9f2d98c7d2c8661fef':
Do not set waitForDebugger if the process to be debugged already started
Change-Id: I718c10716f54c49d727d1ce9f6378365d93842f8
Erik Kline [Wed, 27 Apr 2016 00:09:01 +0000 (00:09 +0000)]
Merge "Move IPv4 address setting to IpManager" into nyc-dev
am:
844ee77
* commit '
844ee77b6af93fcfa758d9530a049ae659ca34f0':
Move IPv4 address setting to IpManager
Change-Id: Ie843c24a595b7e83dd51ef27d71f896b33aa997e
Jeff Sharkey [Wed, 27 Apr 2016 00:04:00 +0000 (00:04 +0000)]
Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev
Chong Zhang [Tue, 26 Apr 2016 23:29:38 +0000 (23:29 +0000)]
Merge "Request a wallpaper update pass when wallpaper target is set to visible" into nyc-dev
Chong Zhang [Tue, 26 Apr 2016 23:28:04 +0000 (23:28 +0000)]
Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev
Erik Kline [Tue, 26 Apr 2016 23:27:46 +0000 (23:27 +0000)]
Merge "Move IPv4 address setting to IpManager" into nyc-dev
Todd Kennedy [Tue, 26 Apr 2016 22:41:20 +0000 (15:41 -0700)]
Don't override pre-release target sdk
If a package targets a pre-release SDK [eg a letter version] it should not
be allowed to be upgraded by a release SDK [eg a number version]. If one
absolutely must upgrade to a release SDK, use the "--force-sdk" option
during install.
Bug:
28345311
Change-Id: Ic9fb209968e7c5da2c80c5ca4c0f44f5125f610a
Chong Zhang [Tue, 26 Apr 2016 23:21:07 +0000 (16:21 -0700)]
Finish immediately if the resumed activity is already visible
When in FINISH_AFTER_VISIBLE mode, we need to check visibility of
both the current activity, and the activity to be resumed. If the
resumed activity is already visible, we should finish immediately.
We can't put it into stopping state and wait because there won't be
a window visible callback from the next activity.
bug:
28378359
Change-Id: Ib1fb44acfec33616da76f48102cc00b453e41914
Jeff Sharkey [Tue, 26 Apr 2016 23:01:40 +0000 (17:01 -0600)]
Fix two multi-user bugs in package upgrade.
When upgrading a package, we need to fill in the "origUsers" field
so that we can clone the installed state correctly. This was done
for child package, but never set for the parent package.
Also fix a bug where a secondary user requested a package to be
moved. Because that move was pushed onto a Handler, the calling
userId appeared to be the device owner instead of the user that
actually requested the move. (Later in the upgrade flow there is
code that force-installs the package for the requesting user.)
Bug:
26729822
Change-Id: I2d2a007c73558f29a3f8c1408ec373fce6e87761
Oren Blasberg [Tue, 26 Apr 2016 22:53:56 +0000 (22:53 +0000)]
Merge "Show cascading popup menus if screen is big enough." into nyc-dev
am:
c71b630
* commit '
c71b6302fe368ca2fbd4555177acf3cd157f6340':
Show cascading popup menus if screen is big enough.
Change-Id: I26afd14fc851015788394ff5192c243795211567
fionaxu [Tue, 26 Apr 2016 22:53:48 +0000 (22:53 +0000)]
Merge "Add CarrierConfig for metered roaming" into nyc-dev
am:
73efde0
* commit '
73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1':
Add CarrierConfig for metered roaming
Change-Id: I9b8ea629e72fa2d0f09ce8f56d0b6f458d884153
Oren Blasberg [Tue, 26 Apr 2016 22:53:40 +0000 (22:53 +0000)]
Merge "Accommodate NaN in new context menu methods." into nyc-dev
am:
a86d1e0
* commit '
a86d1e0b5938cee1d76aefcc1e8967c353ea922d':
Accommodate NaN in new context menu methods.
Change-Id: I40a1d6b55b7f9cb422d35c1f0881efccd36cc290
Oren Blasberg [Tue, 26 Apr 2016 22:53:34 +0000 (22:53 +0000)]
Merge "Don\'t show icons for top level menus unless forced." into nyc-dev
am:
0967da3
* commit '
0967da398901dd2ac626152a4802c822ca36c63b':
Don't show icons for top level menus unless forced.
Change-Id: Ie6e0d7150f4c7d5af5f1fb22719e5bac0f22d4f0
Shreyas Basarge [Tue, 26 Apr 2016 22:53:30 +0000 (22:53 +0000)]
Merge "Account info on job wakelocks" into nyc-dev
am:
8fcf6a6
* commit '
8fcf6a692262dc182c844b35337b67aeb320021d':
Account info on job wakelocks
Change-Id: I4e0ec17614bd52dbfa1b607cd09de54cbea71fb2
Ruben Brunk [Tue, 26 Apr 2016 22:53:26 +0000 (22:53 +0000)]
Merge "Add manifest attribute for VR activities." into nyc-dev
am:
f84b3e0
* commit '
f84b3e0e2fe11c8ee1d86ad44236ba4129fc3ae1':
Add manifest attribute for VR activities.
Change-Id: I10ca4096eed987bdd79f4f2c59ea22fcf61a1ef5
Oren Blasberg [Tue, 26 Apr 2016 22:43:38 +0000 (22:43 +0000)]
Merge "Show cascading popup menus if screen is big enough." into nyc-dev
Chen Xu [Tue, 26 Apr 2016 22:42:16 +0000 (22:42 +0000)]
Merge "Add CarrierConfig for metered roaming" into nyc-dev
Oren Blasberg [Tue, 26 Apr 2016 22:41:00 +0000 (22:41 +0000)]
Merge "Accommodate NaN in new context menu methods." into nyc-dev
Oren Blasberg [Tue, 26 Apr 2016 22:38:56 +0000 (22:38 +0000)]
Merge "Don't show icons for top level menus unless forced." into nyc-dev
Shreyas Basarge [Tue, 26 Apr 2016 22:36:45 +0000 (22:36 +0000)]
Merge "Account info on job wakelocks" into nyc-dev
Cheryl Potter [Tue, 26 Apr 2016 22:22:14 +0000 (22:22 +0000)]
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
* commit '
5475c951bc5efff1f67ac61e2be46b0a3a18408e':
docs: URL and App Indexing API updates for AS 2.0 support b/
26642964
Change-Id: I3ec454c7b7fc801b4bdeda523594887b7209fe9c
smain@google.com [Tue, 26 Apr 2016 22:22:11 +0000 (22:22 +0000)]
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
* commit '
359b10d73926259d3d4679d0f309b4bb47fe6455':
update Develop tab landing page with Studio 2.0 announcement.
Change-Id: I12b4b17706fba5ed8e8c8e9ee0863f8b668c5808
smain@google.com [Tue, 26 Apr 2016 22:22:05 +0000 (22:22 +0000)]
Merge "change Mac JDK requirement to 6 am:
611a2f4 am:
3b1f66c am:
0619ef2" into nyc-dev
am:
3b93446
* commit '
3b934467d485d38533e96f927b3c7a0bda0ec871':
change Mac JDK requirement to 6
Change-Id: Ic1c27d15ea1d627df33257df8596ead45c5986a5
Adarsh Fernando [Tue, 26 Apr 2016 22:21:56 +0000 (22:21 +0000)]
Merge "Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am:
3dbc405 am:
6eed040 am:
f654443" into nyc-dev
am:
c5f684f
* commit '
c5f684f6f7b70a74b6d0e818d86f5bd51ec406c1':
Docs: Added Instant Run feature overview section
Change-Id: I2f3b585de23e32716654ab3928bcd90bef290f94
Adarsh Fernando [Tue, 26 Apr 2016 22:21:46 +0000 (22:21 +0000)]
Merge "Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am:
b896cd1 am:
abb5afc am:
fe47b6d" into nyc-dev
am:
7a82b58
* commit '
7a82b58a8a030822c88166c62431d590918a70ee':
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes
Change-Id: I8c308a8bde913610636ac7767a9f9b1078029297
Adarsh Fernando [Tue, 26 Apr 2016 22:21:33 +0000 (22:21 +0000)]
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
* commit '
b14b1fd9fa73b6477a93ba38a86b0cb9675ec9aa':
Docs: Added instructions to launch instrumented tests in AS using CTL
Change-Id: Ia61d2551b37d3b7ee372e26c31a31156d0c69643
Dirk Dougherty [Tue, 26 Apr 2016 22:21:20 +0000 (22:21 +0000)]
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
* commit '
da816e80bc39e31224c51f50944313228d49dece':
Change-Id: I56a685bff7e744c51d64e7136f1131d12580a1a0
Kevin Hufnagle [Tue, 26 Apr 2016 22:21:06 +0000 (22:21 +0000)]
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
* commit '
5a073da32b3f1c5eb4f4a4da036269fc413e24a6':
Change-Id: I87298f2a61501f9b9c0fa1d9e81263d7770894b5
sreevanis [Tue, 26 Apr 2016 22:20:52 +0000 (22:20 +0000)]
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
* commit '
239d2c2ea2de856a3462c9a42e7353766899118c':
Change-Id: Ie51d98a6abd93a5f3269d9010563e1fde67c1da8
Chad Brubaker [Tue, 26 Apr 2016 22:20:36 +0000 (22:20 +0000)]
Merge "Merge "Add missing </pin-set>" into mnc-mr-docs am:
5f415c2 am:
0ed59f9 am:
f1ac8fa" into nyc-dev
am:
9dd786c
* commit '
9dd786c7ee0f37c8434d3133a8234de54a0c5ef2':
Change-Id: Ib6ae5892f80934311a6be899901b16cfdfa08db2
Chad Brubaker [Tue, 26 Apr 2016 22:20:01 +0000 (22:20 +0000)]
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: Ieff3863155a2ca796e25d9b2a066a30e601ff6b2
Joe Fernandez [Tue, 26 Apr 2016 22:18:55 +0000 (22:18 +0000)]
Merge "Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am:
4ec3749 am:
83113d6 am:
824429f" into nyc-dev
am:
124260f
* commit '
124260fe650afa6b523f67aebb63b279c4cca1b5':
Change-Id: Ic0499bf53b9cdff8e5486bfba8a9eaa49c752879
Andrew Solovay [Tue, 26 Apr 2016 22:18:29 +0000 (22:18 +0000)]
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
* commit '
641fbbd3f3ebfceff7c21ffd02defd580156ae1a':
Change-Id: Ib865dcc4e8d04787aa8619e9fd8815f90166da02
Dirk Dougherty [Tue, 26 Apr 2016 22:18:06 +0000 (22:18 +0000)]
Merge "Merge "Updates for Play." into mnc-mr-docs am:
3afd52a am:
f4658e2 am:
ab3721a" into nyc-dev
am:
8b10dd2
* commit '
8b10dd2054a1a39ca8a2b1bb6e7034c01cf07bf7':
Change-Id: I6cd37dc8f5e37eba328eab4670b5b047e21c1cbd
Daniel Yu [Tue, 26 Apr 2016 22:17:42 +0000 (22:17 +0000)]
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
* commit '
ae9e686ffc9370dcdf08be2e9555dba36d7d4283':
Change-Id: I4e37358581693631e09495decabbccb6da8a337b
Kevin Hufnagle [Tue, 26 Apr 2016 22:17:16 +0000 (22:17 +0000)]
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
* commit '
df5e1470aa254adf0ef1eda28264ff217574fea8':
Change-Id: If0f12657cbcf23b6e49270f733b2380d9da9d113
Kevin Hufnagle [Tue, 26 Apr 2016 22:16:38 +0000 (22:16 +0000)]
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
* commit '
d3ca191a3fec53143839b5e556a9931d697e1f66':
Change-Id: I9dc14d2d2d0c7596bb9d3235d5dd06ddd049acac
Kevin Hufnagle [Tue, 26 Apr 2016 22:15:20 +0000 (22:15 +0000)]
Merge "Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am:
c9afecd am:
1c076e8 am:
8d336e6" into nyc-dev
am:
a743567
* commit '
a7435670fd077840f2c4680e8bbf5619f3e25f0b':
Change-Id: I179b9ad488a5e5294f6c0f5ac3b37bf034e468d3
Kevin Hufnagle [Tue, 26 Apr 2016 22:14:49 +0000 (22:14 +0000)]
Merge "Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am:
9deafe5 am:
fcf68ef am:
c56d885" into nyc-dev
am:
96eaf3e
* commit '
96eaf3e12dd0587ae06f570fa398f0bae75444e5':
Change-Id: Ic79585db80f4dba8d5280c9dfb4a461bf5ae61aa
Kevin Hufnagle [Tue, 26 Apr 2016 22:14:17 +0000 (22:14 +0000)]
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
* commit '
f49f8eeb72de919965689369ae4179abdc015e22':
Change-Id: I1efbe4def68138550b1c859e78ededc4936fda45
Kevin Hufnagle [Tue, 26 Apr 2016 22:13:45 +0000 (22:13 +0000)]
Merge "Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am:
8ea3fd8 am:
f1cb86cc am:
690cba0" into nyc-dev
am:
ebb60eb
* commit '
ebb60eb1c0df86c6dbba6f1c360efc2298c58462':
Change-Id: I772197fbf7e40276c20d94d83ca929ba3cecec2b
Joe Fernandez [Tue, 26 Apr 2016 22:12:54 +0000 (22:12 +0000)]
Merge "Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am:
42a3312 am:
faa815d am:
2ca2a2c" into nyc-dev
am:
57add8c
* commit '
57add8cae5a6c0381393b24d07ffb0b9bbbca0c5':
Change-Id: I3bd3fc776da63a6caea8cc00504db305ccd12627
Andrew Solovay [Tue, 26 Apr 2016 22:11:20 +0000 (22:11 +0000)]
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: I64d6d7f04269361552fdfd0af6dc8e079ab2fe0a
Andrew Solovay [Tue, 26 Apr 2016 22:10:38 +0000 (22:10 +0000)]
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
* commit '
376b149abd5f50c75ba08d686c275a1048d6fcda':
Change-Id: I6b8ff4100e4ccb16bd03bad068b7889fb26c6d27
Elliot Waite [Tue, 26 Apr 2016 22:10:01 +0000 (22:10 +0000)]
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
* commit '
be3f2dee5d6d5d576636e5d7d733ec926bb77c0a':
Change-Id: I98d3a1b31ddd18d587e0082c6407fcc33a3c03c1
Miao Wang [Tue, 26 Apr 2016 22:08:33 +0000 (22:08 +0000)]
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
* commit '
f11c479e690d00e4d956e3d5884c322c775b5624':
Change-Id: I1a56ebb595a77016fa99caa1068151d4d3d2ab14
sreevanis [Tue, 26 Apr 2016 22:07:33 +0000 (22:07 +0000)]
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
* commit '
d942882bbf65193e53f2df09f68b98f4f919005d':
Change-Id: Ifc3faac95bf173d47c43cc017ab1f684d236f567
sreevanis [Tue, 26 Apr 2016 22:06:46 +0000 (22:06 +0000)]
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
* commit '
4da53c0e770c4c7def871b843451aee7d0a4d7b0':
Change-Id: Ib534f2f3cf31becc752b8332aef031f4dfc0f823
smain@google.com [Tue, 26 Apr 2016 22:05:36 +0000 (22:05 +0000)]
Merge "simplification and clarification to the Studio Overview am:
e9b3ada am:
f1a5076 am:
1f8be54" into nyc-dev
am:
07773c7
* commit '
07773c7e114f30c4ccf1ababe1b734278d6c273d':
Change-Id: I7ef9439b6c7cea1837020a8eba60e27c2eb583a7
Ruben Brunk [Tue, 26 Apr 2016 22:05:28 +0000 (22:05 +0000)]
Merge "Add manifest attribute for VR activities." into nyc-dev
smain@google.com [Tue, 26 Apr 2016 22:03:54 +0000 (22:03 +0000)]
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
* commit '
2b0a5c9667bd7bcb7722fc936fe9f0fba479c02b':
Change-Id: If947504ecdc86e31f4330b455c98bbe5015b8154
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:51 +0000 (21:58 +0000)]
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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:41 +0000 (21:58 +0000)]
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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:31 +0000 (21:58 +0000)]
Merge "change Mac JDK requirement to 6 am:
611a2f4 am:
3b1f66c am:
0619ef2" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:20 +0000 (21:58 +0000)]
Merge "Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am:
3dbc405 am:
6eed040 am:
f654443" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:10 +0000 (21:58 +0000)]
Merge "Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am:
b896cd1 am:
abb5afc am:
fe47b6d" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:01 +0000 (21:58 +0000)]
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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:51 +0000 (21:57 +0000)]
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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:39 +0000 (21:57 +0000)]
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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:30 +0000 (21:57 +0000)]
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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:20 +0000 (21:57 +0000)]
Merge "Merge "Add missing </pin-set>" into mnc-mr-docs am:
5f415c2 am:
0ed59f9 am:
f1ac8fa" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:11 +0000 (21:57 +0000)]
Merge "Merge "Fix application manifest XML" into mnc-mr-docs am:
c8dcc2b am:
3fdc800 am:
fc688ec" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:02 +0000 (21:57 +0000)]
Merge "Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am:
4ec3749 am:
83113d6 am:
824429f" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:53 +0000 (21:56 +0000)]
Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am:
242f06cd am:
0015bf0 am:
bb64fe3" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:44 +0000 (21:56 +0000)]
Merge "Merge "Updates for Play." into mnc-mr-docs am:
3afd52a am:
f4658e2 am:
ab3721a" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:24 +0000 (21:56 +0000)]
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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:12 +0000 (21:56 +0000)]
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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:02 +0000 (21:56 +0000)]
Merge "Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am:
f380435 am:
0da507d am:
7f0d4d0" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:53 +0000 (21:55 +0000)]
Merge "Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am:
c9afecd am:
1c076e8 am:
8d336e6" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:43 +0000 (21:55 +0000)]
Merge "Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am:
9deafe5 am:
fcf68ef am:
c56d885" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:35 +0000 (21:55 +0000)]
Merge "Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am:
88e19d1 am:
2d9cc0f am:
a732be1" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:25 +0000 (21:55 +0000)]
Merge "Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am:
8ea3fd8 am:
f1cb86cc am:
690cba0" into nyc-dev