OSDN Git Service
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
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: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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:24 +0000 (21:54 +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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:15 +0000 (21:54 +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
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:03 +0000 (21:54 +0000)]
Merge "simplification and clarification to the Studio Overview am:
e9b3ada am:
f1a5076 am:
1f8be54" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:53:53 +0000 (21:53 +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
smain@google.com [Tue, 26 Apr 2016 21:47:09 +0000 (21:47 +0000)]
change Mac JDK requirement to 6 am:
611a2f4 am:
3b1f66c
am:
0619ef2
* commit '
0619ef243f887119b921d0874b155287ace70edc':
change Mac JDK requirement to 6
Change-Id: I8a35ad475c64aa7d687398100c0e3df76777d14a
sergeyv [Tue, 26 Apr 2016 21:44:50 +0000 (21:44 +0000)]
Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev
am:
c015719
* commit '
c015719954d9a1c0a53f277f68405401207a0c65':
DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB
Change-Id: I28bec4d86b0e5a29f9c09a766456788b1ae6a808
sergeyv [Tue, 26 Apr 2016 21:44:48 +0000 (21:44 +0000)]
Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev
am:
b7d1657
* commit '
b7d1657016d5f5b384e231979c6dcf18b0334ca4':
Stop always set OffsetByFudgeFactor in renderVertexBuffer
Change-Id: I48db10a24e81bdbd9a71a382c75b3b3069d0dceb
Adarsh Fernando [Tue, 26 Apr 2016 21:44:35 +0000 (21:44 +0000)]
Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am:
3dbc405 am:
6eed040
am:
f654443
* commit '
f6544435b561a4ca50a070dc4dd665dda94becff':
Docs: Added Instant Run feature overview section
Change-Id: Id14287bc04647fc19e477e9ce9469ff9874e322a
Adarsh Fernando [Tue, 26 Apr 2016 21:42:02 +0000 (21:42 +0000)]
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am:
b896cd1 am:
abb5afc
am:
fe47b6d
* commit '
fe47b6d6455dc9e13e7a80e50107fc007ad3daf1':
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes
Change-Id: I4b00bcf7936dc1c5db1d3f54417a4aa1381853c0
Sergei Vasilinetc [Tue, 26 Apr 2016 21:39:42 +0000 (21:39 +0000)]
Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev
Adarsh Fernando [Tue, 26 Apr 2016 21:39:34 +0000 (21:39 +0000)]
Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am:
7961413 am:
88d1e91
am:
8776f89
* commit '
8776f8940a7a73a5763550ab8e902f4ad6210808':
Docs: Added instructions to launch instrumented tests in AS using CTL
Change-Id: If1512e3bc20cfdaed5c08317bdf5889857909b00
Sergei Vasilinetc [Tue, 26 Apr 2016 21:39:07 +0000 (21:39 +0000)]
Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev
Dirk Dougherty [Tue, 26 Apr 2016 21:37:24 +0000 (21:37 +0000)]
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
* commit '
478463ac42fecf7811d0299005ebe1d800b3483b':
Change-Id: I1788b6e613ecd7ae3850dd5fc838787efab7387a
Kevin Hufnagle [Tue, 26 Apr 2016 21:34:40 +0000 (21:34 +0000)]
Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am:
7c909cc am:
090e5fb
am:
5f6a355
* commit '
5f6a355d610474411a826ad9a896d18f7827d7d0':
Change-Id: Ide8d78800c35e5735e18efea2e90b82a0ed65636
sreevanis [Tue, 26 Apr 2016 21:31:56 +0000 (21:31 +0000)]
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
* commit '
26ed50a8cae1ce78a83704e5f104038e53b784b5':
Change-Id: Id2776bdb87590b3dea5acb302573942c5c605abb
Chad Brubaker [Tue, 26 Apr 2016 21:29:57 +0000 (21:29 +0000)]
Merge "Add missing </pin-set>" into mnc-mr-docs am:
5f415c2 am:
0ed59f9
am:
f1ac8fa
* commit '
f1ac8fac41c69114f815f7226c5b695509f8c2ca':
Change-Id: I6cbe92afc06391abd5285471f03629767b598752
Chad Brubaker [Tue, 26 Apr 2016 21:27:05 +0000 (21:27 +0000)]
Merge "Fix application manifest XML" into mnc-mr-docs am:
c8dcc2b am:
3fdc800
am:
fc688ec
* commit '
fc688ec32eaf5815ce3f1ccba6023d5290b8d336':
Change-Id: I35f3641ad371da743a2159eaf14e704b7ff229c2
Joe Fernandez [Tue, 26 Apr 2016 21:23:59 +0000 (21:23 +0000)]
Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am:
4ec3749 am:
83113d6
am:
824429f
* commit '
824429f93ad0ab15b4776acda40f91f972b5e173':
Change-Id: I01b8d416c6c350c1707676d3682800d61fc6442a
Andrew Solovay [Tue, 26 Apr 2016 21:21:48 +0000 (21:21 +0000)]
Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am:
242f06cd am:
0015bf0
am:
bb64fe3
* commit '
bb64fe34ae6ecf0fafa74ddc4d416a21062dc516':
Change-Id: I36475216bbb46c474d1b693250d9392021a6903c
Dirk Dougherty [Tue, 26 Apr 2016 21:19:18 +0000 (21:19 +0000)]
Merge "Updates for Play." into mnc-mr-docs am:
3afd52a am:
f4658e2
am:
ab3721a
* commit '
ab3721ae74d5808ccffb713e256ac48abe895dba':
Change-Id: I37a1841fa7f51bd8ba58b866a8ee255a3aa15954
Daniel Yu [Tue, 26 Apr 2016 21:16:23 +0000 (21:16 +0000)]
Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am:
cac018b am:
9e16ddc
am:
461e731
* commit '
461e731583aad91ca952cba2bab13898e37bb33e':
Change-Id: If3f5053f4d7e12fc0ccf2d5dc94b7141ffaef57b
Kevin Hufnagle [Tue, 26 Apr 2016 21:13:31 +0000 (21:13 +0000)]
Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am:
2f5a204 am:
ddbf8d2c
am:
f63a1c4
* commit '
f63a1c4cfddc0c4ac065c8a5ce09e38fe71c3137':
Change-Id: I09a99fd61f157e171c1a873d91c311cac8bfc0c2
Kevin Hufnagle [Tue, 26 Apr 2016 21:10:50 +0000 (21:10 +0000)]
Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am:
f380435 am:
0da507d
am:
7f0d4d0
* commit '
7f0d4d0799622a803316c201ed7cc1e5135de89e':
Change-Id: I7febd987b8e397f38d34cf0a79b7de399a31fce3
Kevin Hufnagle [Tue, 26 Apr 2016 21:08:48 +0000 (21:08 +0000)]
Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am:
c9afecd am:
1c076e8
am:
8d336e6
* commit '
8d336e6c51380986ac78c348234bd0e0cf4a7380':
Change-Id: Ifa45c62212e81fb9cfaebe98703775715cd14cd0
Kevin Hufnagle [Tue, 26 Apr 2016 21:05:57 +0000 (21:05 +0000)]
Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am:
9deafe5 am:
fcf68ef
am:
c56d885
* commit '
c56d8853ff8a15aa5a5b5ec40c242745fed6a3b6':
Change-Id: I7db5e0257eb921cc391306f69e21b95c9a296863
Kevin Hufnagle [Tue, 26 Apr 2016 21:03:09 +0000 (21:03 +0000)]
Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am:
88e19d1 am:
2d9cc0f
am:
a732be1
* commit '
a732be179d7bc06580b66669d6b6c7ebe05b9e01':
Change-Id: I1a2d3eba374fe931b28e0358740d545348ebceba
Kevin Hufnagle [Tue, 26 Apr 2016 21:00:06 +0000 (21:00 +0000)]
Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am:
8ea3fd8 am:
f1cb86cc
am:
690cba0
* commit '
690cba02682e89299f94d58a5ea9f212006c11c4':
Change-Id: I958d262d9022e91a85f75af7f3e8cb9af1e1f355
Joe Fernandez [Tue, 26 Apr 2016 20:57:54 +0000 (20:57 +0000)]
Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am:
42a3312 am:
faa815d
am:
2ca2a2c
* commit '
2ca2a2c86571d0ad05b95ea0bda7d33414e4cb89':
Change-Id: Ica6e6425d795da330da197536a0e516fb53c8b7d
Andrew Solovay [Tue, 26 Apr 2016 20:55:21 +0000 (20:55 +0000)]
docs: Added link to "preparing for multiwindow" blog post am:
d93472b am:
5db4e1f
am:
04b4190
* commit '
04b41903f9c4ceebc0f5d2e03f8f921f5dc95e69':
Change-Id: I789b9b1066978a665b1262e46a8331c07cd7e9c3
Andrew Solovay [Tue, 26 Apr 2016 20:52:24 +0000 (20:52 +0000)]
Merge "docs: Clarified how multi-window applies to activities in task stack" into mnc-mr-docs am:
a23e28f am:
fbb8b65
am:
3832614
* commit '
3832614650f39719dbbb52ee092c0826291d6516':
Change-Id: Ic5aab52976bceb23ad6c584b87ee86fcff634c76
Elliot Waite [Tue, 26 Apr 2016 20:49:26 +0000 (20:49 +0000)]
Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am:
abb9f4d am:
fe0cc90
am:
e8b402e
* commit '
e8b402e20533d5ce7387a4666683c971b22ba381':
Change-Id: Ie43452782ce7ab1e1bdbce67c007b2d3705c7910
Miao Wang [Tue, 26 Apr 2016 20:46:23 +0000 (20:46 +0000)]
Merge "[RenderScript] Update documentation about API level and RS Support Lib." into mnc-mr-docs am:
f2988f5 am:
2291d03
am:
25570d5
* commit '
25570d531904594d0e73cbc5c7a5105006aa8cdd':
Change-Id: I91af0cd7f8a87e3bf00261cece1bf19c9fb88790
sreevanis [Tue, 26 Apr 2016 20:43:10 +0000 (20:43 +0000)]
Merge "cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support." into mnc-mr-docs am:
f70f0f4 am:
9f57db1
am:
cedb262
* commit '
cedb262cfaffed00f091d2a0abe22f92f9809d3e':
Change-Id: I216382c84e33766b5d6d3bdc6c831ffd9afa6560
sreevanis [Tue, 26 Apr 2016 20:40:13 +0000 (20:40 +0000)]
Merge "docs: Updated API changes for Dinar wearable support." into mnc-docs am:
71b1f0b -s ours am:
a6d7166 am:
0446ed4
am:
f786db7
* commit '
f786db7b9bcc6ebfa79b4bc60a837877e5a8a380':
Change-Id: I0c8528b9a6a0313f8983cd4d75adc244ec68f92d
smain@google.com [Tue, 26 Apr 2016 20:36:57 +0000 (20:36 +0000)]
simplification and clarification to the Studio Overview am:
e9b3ada am:
f1a5076
am:
1f8be54
* commit '
1f8be548ae1c21be6651ddc2621018b2028c58d0':
Change-Id: I2e08479aadd3d223b11e10d873239e14ed1a6976
smain@google.com [Tue, 26 Apr 2016 20:34:41 +0000 (20:34 +0000)]
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
* commit '
07bfe296d0e7337ba42fcf260d1029746308a262':
Change-Id: Iedc8b307eba45aa106b52fac980fe1c0fe8cdae3
Chris Craik [Tue, 26 Apr 2016 20:28:00 +0000 (20:28 +0000)]
Merge "Improve SurfaceView postion snapping" into nyc-dev
am:
987609f
* commit '
987609f5a7bd8e18559334aa0260e6614520af13':
Improve SurfaceView postion snapping
Change-Id: I91683e93b9ddfd47d9ebc0a81cf144c359f106fb
Chris Craik [Tue, 26 Apr 2016 20:20:37 +0000 (20:20 +0000)]
Merge "Improve SurfaceView postion snapping" into nyc-dev
Mady Mellor [Tue, 26 Apr 2016 19:46:09 +0000 (19:46 +0000)]
Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev
am:
6e3a90d
* commit '
6e3a90d9b7789b04121a6b773175b97e165ba702':
Fix a crash when setting vertical gear location and content view null
Change-Id: I90b3cb69e8e292f6270a3f7ae0ba6750a41df7c9
Mady Mellor [Tue, 26 Apr 2016 19:38:42 +0000 (19:38 +0000)]
Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev
Chris Banes [Tue, 26 Apr 2016 19:26:56 +0000 (19:26 +0000)]
Merge "Fix onPrepareActionMode() not being called" into nyc-dev
am:
9412176
* commit '
94121762ff47728fd8080f45f04cafb55b92079d':
Fix onPrepareActionMode() not being called
Change-Id: Ib8accfd3ffafefd963a7d2d8b09e3a2d5cf26a34
Chris Banes [Tue, 26 Apr 2016 19:20:14 +0000 (19:20 +0000)]
Merge "Fix onPrepareActionMode() not being called" into nyc-dev
Svet Ganov [Tue, 26 Apr 2016 18:47:52 +0000 (18:47 +0000)]
Merge "Ensure local settings caches are not stale" into nyc-dev
am:
f71d7fe
* commit '
f71d7feef22db9e0cab2f32edc7440aedb86fdfe':
Ensure local settings caches are not stale
Change-Id: Iab7ff4dbfb4961b131b8ab82656b99bf45ed29bf
Alan Viverette [Tue, 26 Apr 2016 18:37:49 +0000 (18:37 +0000)]
Merge "Remove -night qualified resources" into nyc-dev
am:
83ca62b
* commit '
83ca62bdbe00359a1cf574efc5abfb19c5f57337':
Remove -night qualified resources
Change-Id: Ie61dafd3462a85bec90496a0ee4aa3e06d96c8e4
Svetoslav Ganov [Tue, 26 Apr 2016 18:36:26 +0000 (18:36 +0000)]
Merge "Ensure local settings caches are not stale" into nyc-dev
TreeHugger Robot [Tue, 26 Apr 2016 18:33:03 +0000 (18:33 +0000)]
Merge "Remove -night qualified resources" into nyc-dev
Svet Ganov [Wed, 20 Apr 2016 02:38:00 +0000 (19:38 -0700)]
Ensure local settings caches are not stale
We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.
This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.
The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.
We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.
The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.
bug:
18826179
Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
Eino-Ville Talvala [Tue, 26 Apr 2016 18:31:14 +0000 (18:31 +0000)]
Merge "SchedulingPolicyService: Fix UID for cameraserver" into nyc-dev
am:
e9bfc4e
* commit '
e9bfc4e20b1a0269c8b7fc7f52eb15ebaacdefec':
SchedulingPolicyService: Fix UID for cameraserver
Change-Id: Ia2adf7e06fa63ef8eac28dddbda08f5c0b2fe99c
OSDN Git Service
