drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,420 Commits 1 Branch 0 Tags
Commit Graph

241420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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

* commit '359b10d73926259d3d4679d0f309b4bb47fe6455':
  update Develop tab landing page with Studio 2.0 announcement.

Change-Id: Ie3a84d6b9e3708940d5c5032a64f341acbff64b3
 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

* commit '3b934467d485d38533e96f927b3c7a0bda0ec871':
  change Mac JDK requirement to 6

Change-Id: Iff88ecc99b2bbb895860d2d59b76e7ae0743ac5c
 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

* commit 'c5f684f6f7b70a74b6d0e818d86f5bd51ec406c1':
  Docs: Added Instant Run feature overview section

Change-Id: I438d08ecb9c9fcf54896a7ecc060b340c95b8aac
 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

* commit '7a82b58a8a030822c88166c62431d590918a70ee':
  Docs: Added Android Plugin for Gradle v2.0.0 Release Notes

Change-Id: I7e856920cbcb8183b9044a28f2d323f3981f0c44
 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

* commit 'b14b1fd9fa73b6477a93ba38a86b0cb9675ec9aa':
  Docs: Added instructions to launch instrumented tests in AS using CTL

Change-Id: Ifd059e9982082df6b596ecd4b83eaf50a28c7bc2
 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

* commit 'da816e80bc39e31224c51f50944313228d49dece':

Change-Id: I9a60fa47a2faebb6780ab79c3e444304500263b3
 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

* commit '5a073da32b3f1c5eb4f4a4da036269fc413e24a6':

Change-Id: Ic2c7211f177c8a3deac8d7ded8bba6508803d5e4
 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

* commit '239d2c2ea2de856a3462c9a42e7353766899118c':

Change-Id: I7cbcfbc0f3e8197089ab142c2e2f2f1c7d13debd
 2016-04-26 22:19:56 +00: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

* commit '9dd786c7ee0f37c8434d3133a8234de54a0c5ef2':

Change-Id: I3cdb27b95ec0b24066e2a2a4ae4cb81fde4078d7
 2016-04-26 22:18:59 +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

* commit '124260fe650afa6b523f67aebb63b279c4cca1b5':

Change-Id: I89c6cf841c901484edef193fd7bef55b083f1ca6
 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

* commit '641fbbd3f3ebfceff7c21ffd02defd580156ae1a':

Change-Id: I511bb6c0d77f37c55170444595d19ef66f628bed
 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

* commit '8b10dd2054a1a39ca8a2b1bb6e7034c01cf07bf7':

Change-Id: I7368aaaf696369aaecfc753d94c207de877069e7
 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

* commit 'ae9e686ffc9370dcdf08be2e9555dba36d7d4283':

Change-Id: Ic0ff850549d63a0bc91aca2f11aad5e3976d8d82
 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

* commit 'df5e1470aa254adf0ef1eda28264ff217574fea8':

Change-Id: Id90d4ecaefa24a5613a8d2c1b5af3a75ca89f2f7
 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

* commit 'd3ca191a3fec53143839b5e556a9931d697e1f66':

Change-Id: Ie46cb0e7ed49a8098015fca9c57506a56b9dc792
 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

* commit 'a7435670fd077840f2c4680e8bbf5619f3e25f0b':

Change-Id: I40014203daf2ad3e24807a89f29b683ac11a068c
 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

* commit '96eaf3e12dd0587ae06f570fa398f0bae75444e5':

Change-Id: Ie58b1cf237e0d7ed3578c56f5af5ff52a6c50b1a
 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

* commit 'f49f8eeb72de919965689369ae4179abdc015e22':

Change-Id: Iab47b2e9f9697ac1988cc5598a53626af637fd83
 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

* commit 'ebb60eb1c0df86c6dbba6f1c360efc2298c58462':

Change-Id: I37b7302583db3fc4697af00a01f053f3e47532a4
 2016-04-26 22:13:15 +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

* commit '57add8cae5a6c0381393b24d07ffb0b9bbbca0c5':

Change-Id: Idafd0b9cf63097d569763e81321a8711eccd1774
 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
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

* commit '376b149abd5f50c75ba08d686c275a1048d6fcda':

Change-Id: Ie557c71c82a41f1eb94b4a57675997030611001f
 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

* commit 'be3f2dee5d6d5d576636e5d7d733ec926bb77c0a':

Change-Id: I4729ec91d69cd7e2883ff56ee73e279576bce41b
 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

* commit 'f11c479e690d00e4d956e3d5884c322c775b5624':

Change-Id: I9d101acb8e22641402508227492b300e336627a2
 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

* commit 'd942882bbf65193e53f2df09f68b98f4f919005d':

Change-Id: I21c5feb0fc3df9f45e2fee0ecb4d9e03a271f741
 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

* commit '4da53c0e770c4c7def871b843451aee7d0a4d7b0':

Change-Id: I9cc43c6d1f410d611e0a6b44ee692c1130428cd9
 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

* commit '07773c7e114f30c4ccf1ababe1b734278d6c273d':

Change-Id: Ie2f73b40eac2c7cf83918437c5c7da0294198237
 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

* commit '2b0a5c9667bd7bcb7722fc936fe9f0fba479c02b':

Change-Id: I86ce514929a11810f7f065df17b47c773f44336b
 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
Android Build Merger (Role)
9dd786c7ee Merge "Merge "Add missing </pin-set>" into mnc-mr-docs am: 5f415c2 am: 0ed59f9 am: f1ac8fa" into nyc-dev 2016-04-26 21:57:21 +00:00
Android Build Merger (Role)
c41d00358c Merge "Merge "Fix application manifest XML" into mnc-mr-docs am: c8dcc2b am: 3fdc800 am: fc688ec" into nyc-dev 2016-04-26 21:57:12 +00:00
Android Build Merger (Role)
124260fe65 Merge "Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am: 4ec3749 am: 83113d6 am: 824429f" into nyc-dev 2016-04-26 21:57:04 +00:00
Android Build Merger (Role)
641fbbd3f3 Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am: 242f06cd am: 0015bf0 am: bb64fe3" into nyc-dev 2016-04-26 21:56:54 +00:00
Android Build Merger (Role)
8b10dd2054 Merge "Merge "Updates for Play." into mnc-mr-docs am: 3afd52a am: f4658e2 am: ab3721a" into nyc-dev 2016-04-26 21:56:46 +00:00
Android Build Merger (Role)
ae9e686ffc 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 2016-04-26 21:56:26 +00:00
Android Build Merger (Role)
df5e1470aa 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 2016-04-26 21:56:15 +00:00
Android Build Merger (Role)
d3ca191a3f Merge "Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am: f380435 am: 0da507d am: 7f0d4d0" into nyc-dev 2016-04-26 21:56:04 +00:00
Android Build Merger (Role)
a7435670fd Merge "Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am: c9afecd am: 1c076e8 am: 8d336e6" into nyc-dev 2016-04-26 21:55:55 +00:00
Android Build Merger (Role)
96eaf3e12d Merge "Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am: 9deafe5 am: fcf68ef am: c56d885" into nyc-dev 2016-04-26 21:55:45 +00:00
Android Build Merger (Role)
f49f8eeb72 Merge "Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am: 88e19d1 am: 2d9cc0f am: a732be1" into nyc-dev 2016-04-26 21:55:36 +00:00