Deepanshu Gupta
9c9bcd3486
am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
...
* commit 'cae76a70bfca9f37a10f34582cddbe0792625f26':
Nullity annotations to some tests.
2015-05-07 00:21:03 +00:00
Deepanshu Gupta
b2951490ea
am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
...
* commit 'b19325be074e466c39e86fd4418726a7c305546c':
Fix title bar showing when not required.
2015-05-07 00:20:59 +00:00
Deepanshu Gupta
88b193d717
am 047a28ec: am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
...
* commit '047a28ec506bb40081eef6eaf8434884157709ce':
LayoutLib: fix crash when shadow size <=0.
2015-05-07 00:20:53 +00:00
Deepanshu Gupta
cae76a70bf
am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
...
* commit '4624107185135db9db6bfbfb3d0c3a0951c19ee1':
Nullity annotations to some tests.
2015-05-07 00:08:22 +00:00
Deepanshu Gupta
b19325be07
am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
...
* commit '2e3c41a4e4fbb811cdafc754708d62cba7c6c1b6':
Fix title bar showing when not required.
2015-05-07 00:08:01 +00:00
Deepanshu Gupta
047a28ec50
am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
...
* commit '96437fb4b05be2602bb0fa215988be646aec28fc':
LayoutLib: fix crash when shadow size <=0.
2015-05-07 00:07:54 +00:00
Deepanshu Gupta
4624107185
am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
...
* commit '4f8a999682fdb8b38ee5671b8a8f527569ebb5ff':
Nullity annotations to some tests.
2015-05-06 23:53:23 +00:00
Deepanshu Gupta
2e3c41a4e4
am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
...
* commit '92e798682b5e45a05bffecb40a9b9f473420ea79':
Fix title bar showing when not required.
2015-05-06 23:53:18 +00:00
Deepanshu Gupta
96437fb4b0
am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
...
* commit '9aa600e79f8f68115e8e95f02933376e3da7d194':
LayoutLib: fix crash when shadow size <=0.
2015-05-06 23:53:14 +00:00
Deepanshu Gupta
4f8a999682
Merge "Nullity annotations to some tests." into lmp-mr1-dev
2015-05-06 23:42:20 +00:00
Deepanshu Gupta
92e798682b
Merge "Fix title bar showing when not required." into lmp-mr1-dev
2015-05-06 23:42:01 +00:00
Deepanshu Gupta
9aa600e79f
Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
2015-05-06 23:41:36 +00:00
Rich Slogar
34e0f6401e
am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
...
* commit '84a67c7db75edc192a8975637c99c9a917796ff1':
docs: gradle multidex update
2015-05-06 01:14:31 +00:00
Rich Slogar
b462da9e3d
am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
...
* commit 'f0ea8f9f1e1ede23f954cade5ee4a84e92d28943':
docs: overview link to release notes
2015-05-06 01:14:26 +00:00
Rich Slogar
48ea776229
am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs
...
* commit '7e33aa4843edbc037659023cff98dd44ac90d44c':
docs: translation editor update
2015-05-06 01:14:21 +00:00
Rich Slogar
cc4a29807e
am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
...
* commit 'ffef3b76762ae32c3a6fca00fa9cbdd1230f6f83':
docs: memory monitor duplicate paragraph
2015-05-06 01:14:08 +00:00
Rich Slogar
84a67c7db7
am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
...
* commit '1b5f692d853cf5e873dbe4eb93c34e3fcdbb02ed':
docs: gradle multidex update
2015-05-06 01:00:16 +00:00
Rich Slogar
f0ea8f9f1e
am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
...
* commit 'f77d64dca71e9a11de3f234ce686692dae9d92ed':
docs: overview link to release notes
2015-05-06 01:00:12 +00:00
Rich Slogar
7e33aa4843
am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs
...
* commit '96d00bb64c8dc9fb85f1f2ecb894930d3eacd0d5':
docs: translation editor update
2015-05-06 01:00:08 +00:00
Rich Slogar
ffef3b7676
am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
...
* commit '39b51b4968c0aeeef84d5d75ef683516e658a30d':
docs: memory monitor duplicate paragraph
2015-05-06 01:00:04 +00:00
Rich Slogar
e12c404a07
am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
...
* commit '35d7cd40bb167ee08bbb855195eb395e77a05b7a':
docs: providing resources link
2015-05-06 00:58:49 +00:00
Rich Slogar
35d7cd40bb
am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
...
* commit 'd0551feed28614dad957a09998522b25392ce621':
docs: providing resources link
2015-05-06 00:50:57 +00:00
Rich Slogar
1b5f692d85
am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
...
* commit '9b4d57e1dc480f375dc26a77333ff4705f760bb8':
docs: gradle multidex update
2015-05-06 00:44:58 +00:00
Rich Slogar
f77d64dca7
am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
...
* commit '2f14c38ffb5da66ab58551a1ccd273dfb602babf':
docs: overview link to release notes
2015-05-06 00:44:53 +00:00
Rich Slogar
96d00bb64c
am 37ca7773: Merge "docs: translation editor update" into lmp-docs
...
* commit '37ca7773a59cb4a7de4406378f5b1c8d4c5fefd2':
docs: translation editor update
2015-05-06 00:44:48 +00:00
Rich Slogar
39b51b4968
am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
...
* commit '2febf6e0a5bd9f716005c256f7357c6f44b52c2b':
docs: memory monitor duplicate paragraph
2015-05-06 00:44:42 +00:00
Rich Slogar
d0551feed2
Merge "docs: providing resources link" into lmp-mr1-ub-docs
2015-05-05 23:44:34 +00:00
Rich Slogar
9b4d57e1dc
Merge "docs: gradle multidex update" into lmp-docs
2015-05-05 23:42:23 +00:00
Jean-Luc Brouillet
79f12bb648
am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.
...
* commit 'd967fcbee77b2872cb5ae6b05aaabbbc764f806b':
docs: Overhaul of the RenderScript reference documentation.
2015-05-05 23:39:28 +00:00
Rich Slogar
2f14c38ffb
Merge "docs: overview link to release notes" into lmp-docs
2015-05-05 23:38:50 +00:00
Rich Slogar
37ca7773a5
Merge "docs: translation editor update" into lmp-docs
2015-05-05 23:38:18 +00:00
Rich Slogar
2febf6e0a5
Merge "docs: memory monitor duplicate paragraph" into lmp-docs
2015-05-05 23:37:52 +00:00
Jean-Luc Brouillet
d967fcbee7
am e9f17cda: docs: Overhaul of the RenderScript reference documentation.
...
* commit 'e9f17cda80ae60818f43b4ed724436c8b88fd0db':
docs: Overhaul of the RenderScript reference documentation.
2015-05-05 23:27:04 +00:00
Jean-Luc Brouillet
e9f17cda80
docs: Overhaul of the RenderScript reference documentation.
...
cherry-pick from CL: https://android-review.googlesource.com/148241
This CL replaces the Doxygen generated documentation by one that's created
by our internal tool found in framework/rs/api. The big advantages:
- Can handle overloaded functions. Doxygen could not and RenderScript has many.
- Can have version information.
- Can match the look of the Java documentation.
- Cleaner look and no leaking of internal paths.
This CL also include changes introduced by the L release which was missing
previously.
Change-Id: Icade41d04d35e45c445ad952bb8ce14389f9f59f
2015-05-05 15:20:50 -07:00
Andrew Solovay
a4d0e5282c
am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
...
* commit 'd8039f048db26847a3da5367a0b69e2bd3f340e0':
2015-05-05 18:15:35 +00:00
Andrew Solovay
d8039f048d
am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
...
* commit '7916753474be29f117d2f31dc4c6bc76ff76b92f':
Docs: New swipe-to-refresh training guide.
2015-05-05 18:01:14 +00:00
Dirk Dougherty
08c72b91be
am ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
...
* commit 'ecfed34d3e71bfceae11493b8441a051e803ec05':
Doc change: merge landing page and header/footer designs.
2015-05-05 02:34:51 +00:00
Dirk Dougherty
ecfed34d3e
Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
2015-05-05 02:27:47 +00:00
Rich Slogar
2f6261534b
am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
...
* commit '39220a7e924e659dffccd94ea7680f3ef8ac14b6':
docs: Update Eclipse migrate procedure
2015-05-05 00:59:34 +00:00
Andrew Solovay
168bbcef02
am 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
...
* commit '65241c66974053203a66c11cd27678b84f65691c':
Docs: New swipe-to-refresh training guide.
2015-05-05 00:59:30 +00:00
Rich Slogar
39220a7e92
am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
...
* commit '023901c628f0f01fc05aa83b45e57f883fba21ea':
docs: Update Eclipse migrate procedure
2015-05-04 19:15:01 +00:00
Andrew Solovay
65241c6697
am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
...
* commit '9ceea140a3830794b202eec6be68a9a13e37c59f':
Docs: New swipe-to-refresh training guide.
2015-05-04 19:14:57 +00:00
Rich Slogar
023901c628
am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
...
* commit 'ffd0e519299d69b214fb7c96f96f3e34fc2bbf56':
docs: Update Eclipse migrate procedure
2015-05-04 19:00:19 +00:00
Andrew Solovay
7916753474
am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
...
* commit 'c11741042d541f222a6cf19bc9cd15c2c892f150':
Docs: New swipe-to-refresh training guide.
2015-05-04 18:44:50 +00:00
Rich Slogar
ffd0e51929
Merge "docs: Update Eclipse migrate procedure" into lmp-docs
2015-05-04 18:43:39 +00:00
Andrew Solovay
c11741042d
am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
...
* commit 'fbd4af0f9b6614482c846404434af8571bad5817':
Docs: New swipe-to-refresh training guide.
2015-05-04 18:27:33 +00:00
Andrew Solovay
9ceea140a3
am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
...
* commit 'fbd4af0f9b6614482c846404434af8571bad5817':
Docs: New swipe-to-refresh training guide.
2015-05-04 18:26:43 +00:00
Andrew Solovay
fbd4af0f9b
Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
2015-05-04 18:12:55 +00:00
Joe Fernandez
722b509df5
am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs
...
* commit 'a246d2dd4bf8fd6e00561e234f4d2bd41f2f3b68':
docs: Android Developer Dashboard update - May 2015
2015-05-04 17:19:32 +00:00
Joe Fernandez
a246d2dd4b
am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs
...
* commit '9dabc784ee3fe1fd16bb9bc00eb8d3bafce2b078':
docs: Android Developer Dashboard update - May 2015
2015-05-04 17:08:12 +00:00
