OSDN Git Service
Tomasz Mikolajewski [Wed, 27 Apr 2016 01:31:37 +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: I37029f399b59c7f2d72fb9fc68a3d60f1449a8c1
Chong Zhang [Wed, 27 Apr 2016 01:31:34 +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: I7446e434103ee9e7473eeb0b40af6ec20aa21bfc
Tomasz Mikolajewski [Wed, 27 Apr 2016 01:11:02 +0000 (01:11 +0000)]
Merge "Exclude virtual files from ACTION_SEND." into nyc-dev
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:45 +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: I59519454c9304b37404da00044f833a8fe6e7890
Robert Carr [Wed, 27 Apr 2016 00:54:55 +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: I4349a4c56bf64da100a4d054a84903b2143ccf82
TreeHugger Robot [Wed, 27 Apr 2016 00:53:17 +0000 (00:53 +0000)]
Merge "Don't override pre-release target sdk" into nyc-dev
Rob Carr [Wed, 27 Apr 2016 00:47:57 +0000 (00:47 +0000)]
Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
Adarsh Fernando [Wed, 27 Apr 2016 00:47:51 +0000 (00:47 +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: I5f7ce51899f7e462ac088629f61e06927275c1d8
Jeff Sharkey [Wed, 27 Apr 2016 00:47:48 +0000 (00:47 +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: Icf3ad9c02c50f30f40c3772bdded2fb295fade74
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:21 +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: I611a1df2f97537019e66d1b756ae8c4dee57171d
Tomasz Mikolajewski [Wed, 27 Apr 2016 00:36:19 +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: Ief946fe886f8a172cd9e75c0e59904293f0335e2
Robert Carr [Wed, 27 Apr 2016 00:36:18 +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: Id9f08ac6bd213317ddfa229fd2d3a3bf105976c9
Cheryl Potter [Wed, 27 Apr 2016 00:36:16 +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: Ib5c2b342783ec9ab91e61cb60aa5fc979a9a0425
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:08:25 +0000 (00:08 +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: I94fd56620c42796eb0c8c206d96ddfb1f5a8a436
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:37:03 +0000 (23:37 +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: I5ce250fe1a7e054cd9f522b82a55d6e408807cd4
Chong Zhang [Tue, 26 Apr 2016 23:37:02 +0000 (23:37 +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: I9a4de5653a003f5ec12416d0bf95d6423713c7bd
Erik Kline [Tue, 26 Apr 2016 23:37:00 +0000 (23:37 +0000)]
Merge "Move IPv4 address setting to IpManager" into nyc-dev
am:
844ee77
* commit '
844ee77b6af93fcfa758d9530a049ae659ca34f0':
Move IPv4 address setting to IpManager
Change-Id: Ia31075dfe5551c5ae9d63800dc535462efe3f06a
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:50:16 +0000 (22:50 +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: I253cec6780f083e915f073b501de47d1e970e8ff
fionaxu [Tue, 26 Apr 2016 22:50:14 +0000 (22:50 +0000)]
Merge "Add CarrierConfig for metered roaming" into nyc-dev
am:
73efde0
* commit '
73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1':
Add CarrierConfig for metered roaming
Change-Id: Ic3955a4a208dcf206d607cda25eee03c37e96a1e
Oren Blasberg [Tue, 26 Apr 2016 22:50:12 +0000 (22:50 +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: I16e5660e880e1b88b5d2b96fc403ba4becefefec
Oren Blasberg [Tue, 26 Apr 2016 22:50:09 +0000 (22:50 +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: I50b66d5f2a3b133300dc40e57d7acb393e0ce403
Shreyas Basarge [Tue, 26 Apr 2016 22:50:06 +0000 (22:50 +0000)]
Merge "Account info on job wakelocks" into nyc-dev
am:
8fcf6a6
* commit '
8fcf6a692262dc182c844b35337b67aeb320021d':
Account info on job wakelocks
Change-Id: I864e9c089e2ddcab1b3d00db85013af14ebed8fa
Ruben Brunk [Tue, 26 Apr 2016 22:50:02 +0000 (22:50 +0000)]
Merge "Add manifest attribute for VR activities." into nyc-dev
am:
f84b3e0
* commit '
f84b3e0e2fe11c8ee1d86ad44236ba4129fc3ae1':
Add manifest attribute for VR activities.
Change-Id: I6450e6237a9e5a2bc275d465d758a3e70a66fb23
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:21:21 +0000 (22:21 +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: Ia502c9a7b04e908a075b3bcf5fa89015fe6a1104
smain@google.com [Tue, 26 Apr 2016 22:21:19 +0000 (22:21 +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: Ie3a84d6b9e3708940d5c5032a64f341acbff64b3
smain@google.com [Tue, 26 Apr 2016 22:21:14 +0000 (22:21 +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: Iff88ecc99b2bbb895860d2d59b76e7ae0743ac5c
Adarsh Fernando [Tue, 26 Apr 2016 22:21:08 +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: I438d08ecb9c9fcf54896a7ecc060b340c95b8aac
Adarsh Fernando [Tue, 26 Apr 2016 22:21:01 +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: I7e856920cbcb8183b9044a28f2d323f3981f0c44
Adarsh Fernando [Tue, 26 Apr 2016 22:20:52 +0000 (22:20 +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: Ifd059e9982082df6b596ecd4b83eaf50a28c7bc2
Dirk Dougherty [Tue, 26 Apr 2016 22:20:42 +0000 (22:20 +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: I9a60fa47a2faebb6780ab79c3e444304500263b3
Kevin Hufnagle [Tue, 26 Apr 2016 22:20:28 +0000 (22:20 +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: Ic2c7211f177c8a3deac8d7ded8bba6508803d5e4
sreevanis [Tue, 26 Apr 2016 22:19:56 +0000 (22:19 +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: I7cbcfbc0f3e8197089ab142c2e2f2f1c7d13debd
Chad Brubaker [Tue, 26 Apr 2016 22:18:59 +0000 (22:18 +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: I3cdb27b95ec0b24066e2a2a4ae4cb81fde4078d7
Chad Brubaker [Tue, 26 Apr 2016 22:18:38 +0000 (22:18 +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: Id715a64a856413dee350a8c9935efaa7e487dd80
Joe Fernandez [Tue, 26 Apr 2016 22:18:17 +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: I89c6cf841c901484edef193fd7bef55b083f1ca6
Andrew Solovay [Tue, 26 Apr 2016 22:17:56 +0000 (22:17 +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: I511bb6c0d77f37c55170444595d19ef66f628bed
Dirk Dougherty [Tue, 26 Apr 2016 22:17:34 +0000 (22:17 +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: I7368aaaf696369aaecfc753d94c207de877069e7
Daniel Yu [Tue, 26 Apr 2016 22:17:13 +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: Ic0ff850549d63a0bc91aca2f11aad5e3976d8d82
Kevin Hufnagle [Tue, 26 Apr 2016 22:16:38 +0000 (22:16 +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: Id90d4ecaefa24a5613a8d2c1b5af3a75ca89f2f7
Kevin Hufnagle [Tue, 26 Apr 2016 22:15:22 +0000 (22:15 +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: Ie46cb0e7ed49a8098015fca9c57506a56b9dc792
Kevin Hufnagle [Tue, 26 Apr 2016 22:14:53 +0000 (22:14 +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: I40014203daf2ad3e24807a89f29b683ac11a068c
Kevin Hufnagle [Tue, 26 Apr 2016 22:14:24 +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: Ie58b1cf237e0d7ed3578c56f5af5ff52a6c50b1a
Kevin Hufnagle [Tue, 26 Apr 2016 22:13:54 +0000 (22:13 +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: Iab47b2e9f9697ac1988cc5598a53626af637fd83
Kevin Hufnagle [Tue, 26 Apr 2016 22:13:15 +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: I37b7302583db3fc4697af00a01f053f3e47532a4
Joe Fernandez [Tue, 26 Apr 2016 22:11:40 +0000 (22:11 +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: Idafd0b9cf63097d569763e81321a8711eccd1774
Andrew Solovay [Tue, 26 Apr 2016 22:11:02 +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: Ic8f32a9b2095e0195c26341c1df9834c68de9bc7
Andrew Solovay [Tue, 26 Apr 2016 22:10:26 +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: Ie557c71c82a41f1eb94b4a57675997030611001f
Elliot Waite [Tue, 26 Apr 2016 22:09:49 +0000 (22:09 +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: I4729ec91d69cd7e2883ff56ee73e279576bce41b
Miao Wang [Tue, 26 Apr 2016 22:08:06 +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: I9d101acb8e22641402508227492b300e336627a2
sreevanis [Tue, 26 Apr 2016 22:07:22 +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: I21c5feb0fc3df9f45e2fee0ecb4d9e03a271f741
sreevanis [Tue, 26 Apr 2016 22:06:37 +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: I9cc43c6d1f410d611e0a6b44ee692c1130428cd9
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:05:06 +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: Ie2f73b40eac2c7cf83918437c5c7da0294198237
smain@google.com [Tue, 26 Apr 2016 22:03:59 +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: I86ce514929a11810f7f065df17b47c773f44336b
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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:14 +0000 (21:55 +0000)]
Merge "Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am:
42a3312 am:
faa815d am:
2ca2a2c" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:05 +0000 (21:55 +0000)]
Merge "docs: Added link to "preparing for multiwindow" blog post am:
d93472b am:
5db4e1f am:
04b4190" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:53 +0000 (21:54 +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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:43 +0000 (21:54 +0000)]
Merge "Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am:
abb9f4d am:
fe0cc90 am:
e8b402e" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:33 +0000 (21:54 +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
OSDN Git Service
