OSDN Git Service
Mike Colagrosso [Wed, 27 May 2015 15:23:36 +0000 (15:23 +0000)]
am
6eea30c4: Merge "Android Training: Add missing word" into lmp-docs
* commit '
6eea30c422811da1b989500147afb82b5f2d45e0':
Android Training: Add missing word
Mike Colagrosso [Wed, 27 May 2015 15:04:47 +0000 (15:04 +0000)]
Merge "Android Training: Add missing word" into lmp-docs
Luan Nguyen [Tue, 26 May 2015 21:16:38 +0000 (21:16 +0000)]
Merge "docs: Replace Umano with WhatsApp icon" into lmp-mr1-ub-docs
Luan Nguyen [Fri, 15 May 2015 20:38:55 +0000 (13:38 -0700)]
docs: Replace Umano with WhatsApp icon
bug:
20528996
Change-Id: I725723580167eec11a7f85e4e7b95cc864aa7679
Aleks Haecky [Tue, 26 May 2015 21:01:06 +0000 (21:01 +0000)]
am
fdd06fe6: Merge "docs: Add peformance tools getting started docs in new tools/performance subtree." into lmp-docs
* commit '
fdd06fe6f9ff92b8fc8a289870103150d065e9cd':
docs: Add peformance tools getting started docs in new tools/performance subtree.
Aleks Haecky [Tue, 26 May 2015 20:48:09 +0000 (20:48 +0000)]
Merge "docs: Add peformance tools getting started docs in new tools/performance subtree." into lmp-docs
Aleks Haecky [Thu, 23 Apr 2015 20:17:19 +0000 (13:17 -0700)]
docs: Add peformance tools getting started docs in new tools/performance subtree.
Bug: 231376
Change-Id: I8126a0c71f3e87bbb2e3823aacbe0ab20c59d5a9
David Friedman [Tue, 26 May 2015 05:26:58 +0000 (05:26 +0000)]
am
d580302d: Docs: Submitting fix for build-breaking CL 695942.
* commit '
d580302d622e4583c7ab2db8759ea8036614df6e':
Docs: Submitting fix for build-breaking CL 695942.
David Friedman [Tue, 26 May 2015 04:53:23 +0000 (21:53 -0700)]
Docs: Submitting fix for build-breaking CL 695942.
Change-Id: Ic384cfca07f7317c07e33d584340f1678a9f99e4
David Friedman [Mon, 25 May 2015 07:00:32 +0000 (07:00 +0000)]
am
4a6d5c93: Docs: Sample-walkthrough chapters for NDK documentation
* commit '
4a6d5c9399179abcef7877c43f46855152129bd3':
Docs: Sample-walkthrough chapters for NDK documentation
David Friedman [Fri, 22 May 2015 09:31:51 +0000 (02:31 -0700)]
Docs: Sample-walkthrough chapters for NDK documentation
Change-Id: If7422f36d5489271776c7ed085059502e1cdebea
Oliver Woodman [Sat, 23 May 2015 11:29:02 +0000 (11:29 +0000)]
am
eb09fe5e: Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
* commit '
eb09fe5e3a9911daf4cb8e95145d2a6936aa189d':
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
Oliver Woodman [Sat, 23 May 2015 11:15:34 +0000 (11:15 +0000)]
Merge "Remove most of ExoPlayer page, replacing it with links to ExoPlayer site." into lmp-docs
Johan Euphrosine [Fri, 22 May 2015 23:06:20 +0000 (23:06 +0000)]
am
46350fea: frameworks/base/docs/ndk: add missing doxygen css
* commit '
46350feac7398aecb661880827b1c8963f0e8cc5':
frameworks/base/docs/ndk: add missing doxygen css
Johan Euphrosine [Fri, 22 May 2015 22:25:24 +0000 (15:25 -0700)]
frameworks/base/docs/ndk: add missing doxygen css
Change-Id: I509f51879ab5dab28f5128b756babc372ba16b74
David Friedman [Fri, 22 May 2015 19:50:14 +0000 (19:50 +0000)]
am
e23031c9: Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
* commit '
e23031c974c9b051ba639f9ad68f891e2ae87da3':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 10:20:03 +0000 (03:20 -0700)]
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
Change-Id: I3867d70f9d669fa08cd7d533d79e02c15339d4ff
Johan Euphrosine [Fri, 22 May 2015 15:15:51 +0000 (15:15 +0000)]
am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
460bcb54d58b8eec86504d2b4518267a69d5eb16':
frameworks/base/docs: add jd files for NDK reference
Johan Euphrosine [Fri, 22 May 2015 14:39:33 +0000 (14:39 +0000)]
Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
Luan Nguyen [Thu, 21 May 2015 17:09:24 +0000 (10:09 -0700)]
docs: Update the AlwaysOn sample link to point to DAC's samples
Change-Id: I54e2457009ef561c49a042e2a65fa55808a370bf
Johan Euphrosine [Thu, 21 May 2015 08:28:48 +0000 (01:28 -0700)]
frameworks/base/docs: add jd files for NDK reference
Generated using:
https://android-review.googlesource.com/#/c/151627/
Change-Id: Ib4840ef370d6b254da4f0b8f7b972608828b0d0e
Luan Nguyen [Wed, 20 May 2015 23:00:12 +0000 (23:00 +0000)]
Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs
Luan Nguyen [Wed, 20 May 2015 22:59:14 +0000 (22:59 +0000)]
Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
Luan Nguyen [Wed, 20 May 2015 22:58:55 +0000 (22:58 +0000)]
Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs
Luan Nguyen [Wed, 20 May 2015 22:58:27 +0000 (22:58 +0000)]
Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs
Luan Nguyen [Fri, 1 May 2015 14:57:41 +0000 (07:57 -0700)]
docs: Add Always-On lesson for Wear apps
bug:
20089205
Change-Id: I52c79ee2f96b5599529547d83b32269a0771a461
Luan Nguyen [Wed, 22 Apr 2015 17:45:00 +0000 (10:45 -0700)]
docs: Add always-on design for wearable activities
bug:
18960180
Change-Id: I57b5052041984ac48648fc65309a58c9ef255611
Luan Nguyen [Wed, 13 May 2015 17:26:39 +0000 (10:26 -0700)]
docs: Remove references to Android Studio 0.8 beta
bug:
21109817
Change-Id: I8cde77651f7dea324aa4ebebdd7cd6437528098a
Oliver Woodman [Tue, 19 May 2015 16:30:02 +0000 (17:30 +0100)]
Remove most of ExoPlayer page, replacing it with links to ExoPlayer site.
- The dev guide has moved to Github, where we can easily maintain it
together with the code.
- I'd like us to still keep this page on the Android site, to direct
developers toward using ExoPlayer.
- I have no idea what branch this should be on, but can easily cherry-pick
to another one as required.
Change-Id: I9179b822988698053463eed7162e970cab3e1ae4
Rich Slogar [Mon, 18 May 2015 23:45:33 +0000 (23:45 +0000)]
am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
c03a39ab74f5d4c6f62d5323d4049855758fdfcf':
docs: emulator updates
Rich Slogar [Mon, 18 May 2015 17:12:46 +0000 (17:12 +0000)]
Merge "docs: emulator updates" into lmp-docs
Rich Slogar [Mon, 18 May 2015 17:12:22 +0000 (17:12 +0000)]
Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
Mike Colagrosso [Mon, 18 May 2015 05:58:12 +0000 (23:58 -0600)]
Android Training: Add missing word
The description of when to use an IntentService in create-service.jd is
missing a word, which makes it difficult to follow. The cruical phrase
is that an IntentService "is the preferred way to *perform* simple
background operations".
Change-Id: I13e4338cd2bad968d05b945ea398e2332f307850
(cherry picked from commit
eb26cfa4ceb6b89ab2cd39cf026f2cfeec7462c2)
Luan Nguyen [Fri, 15 May 2015 22:22:48 +0000 (22:22 +0000)]
Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs
Joe Fernandez [Thu, 14 May 2015 15:26:36 +0000 (15:26 +0000)]
Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
Joe Fernandez [Fri, 8 May 2015 21:25:42 +0000 (14:25 -0700)]
docs: Add weekly subscriptions and grace period information to IAB docs
b/
20351362
Change-Id: Ie1d9c928acbe3ae3846680d6fa4ff9e2fa049f84
Rich Slogar [Wed, 13 May 2015 23:56:20 +0000 (16:56 -0700)]
docs: build-cmd-line-updates
b/
20944423
Change-Id: I0c384650664c51b5b7879bb58deca2be8f1ceff9
David Friedman [Wed, 13 May 2015 23:16:41 +0000 (23:16 +0000)]
am
f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs
* commit '
f5d6156ce8e56eb92abcf046fd8ff5a9647d38ae':
Docs: NDK r10e changes to publish to DAC.
David Friedman [Wed, 13 May 2015 23:00:37 +0000 (23:00 +0000)]
Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs
David Friedman [Mon, 11 May 2015 21:38:18 +0000 (14:38 -0700)]
Docs: NDK r10e changes to publish to DAC.
Change-Id: Id178523df1d5524bb25d43e304591526e6488b92
Rich Slogar [Tue, 12 May 2015 17:05:40 +0000 (17:05 +0000)]
am
e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs
* commit '
e78f136b1dbe11dc98c5699da24df49fd9dae795':
docs: renderscript using gradle settings
Rich Slogar [Tue, 12 May 2015 16:54:37 +0000 (16:54 +0000)]
Merge "docs: renderscript using gradle settings" into lmp-docs
Joe Fernandez [Tue, 12 May 2015 03:51:23 +0000 (03:51 +0000)]
Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
Jeff Hao [Tue, 12 May 2015 00:33:49 +0000 (17:33 -0700)]
Fix prototype for startMethodTracingSampling in profiling docs.
Change-Id: I1bb48be7d154ef2d513c8f611c52a7c89414737c
(cherry picked from commit
3755c3d8bcc3d0f22eb7a775ec7a689feb7e1725)
Rich Slogar [Mon, 11 May 2015 23:54:55 +0000 (16:54 -0700)]
docs: studio 1.2.1.1 updates
Change-Id: I0e0f25873b06a135e6fd68f1a2aad463d204c4e5
Jeff Hao [Wed, 6 May 2015 01:36:42 +0000 (18:36 -0700)]
Update ddms and profiling docs to include sample profiling.
Bug:
5866094
Change-Id: Ib97990ee2fc823416b3f41856b815d4092818f98
Quddus Chong [Mon, 11 May 2015 21:38:46 +0000 (21:38 +0000)]
am
174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator
* commit '
174dc3ba607965cf1dd0578f83ce373fa74d0f65':
docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
Quddus Chong [Mon, 11 May 2015 21:23:42 +0000 (21:23 +0000)]
Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator." into lmp-docs
Quddus Chong [Tue, 7 Apr 2015 23:42:24 +0000 (16:42 -0700)]
docs: Added training docs for Android unit testing tools and APIs.
This training covers techniques for running unit tests on local
machines, using mock objects in local unit tests, and building
instrumented unit tests to run on a device or emulator.
Change-Id: I9fee9ac3bd7382fb158145600b1850775edb687d
Joe Fernandez [Thu, 7 May 2015 22:14:31 +0000 (15:14 -0700)]
docs: remove obsolete renderscript reference framer page
Change-Id: I9ec7ad462584d2e2b7132b1ddbf9306c9df83b10
Rich Slogar [Wed, 6 May 2015 00:44:58 +0000 (00:44 +0000)]
am
9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '
9b4d57e1dc480f375dc26a77333ff4705f760bb8':
docs: gradle multidex update
Rich Slogar [Wed, 6 May 2015 00:44:53 +0000 (00:44 +0000)]
am
2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
* commit '
2f14c38ffb5da66ab58551a1ccd273dfb602babf':
docs: overview link to release notes
Rich Slogar [Wed, 6 May 2015 00:44:48 +0000 (00:44 +0000)]
am
37ca7773: Merge "docs: translation editor update" into lmp-docs
* commit '
37ca7773a59cb4a7de4406378f5b1c8d4c5fefd2':
docs: translation editor update
Rich Slogar [Wed, 6 May 2015 00:44:42 +0000 (00:44 +0000)]
am
2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit '
2febf6e0a5bd9f716005c256f7357c6f44b52c2b':
docs: memory monitor duplicate paragraph
Rich Slogar [Tue, 5 May 2015 23:44:33 +0000 (23:44 +0000)]
Merge "docs: providing resources link" into lmp-mr1-ub-docs
Rich Slogar [Tue, 5 May 2015 23:42:21 +0000 (23:42 +0000)]
Merge "docs: gradle multidex update" into lmp-docs
Rich Slogar [Tue, 5 May 2015 23:38:49 +0000 (23:38 +0000)]
Merge "docs: overview link to release notes" into lmp-docs
Rich Slogar [Tue, 5 May 2015 23:38:17 +0000 (23:38 +0000)]
Merge "docs: translation editor update" into lmp-docs
Rich Slogar [Tue, 5 May 2015 23:37:51 +0000 (23:37 +0000)]
Merge "docs: memory monitor duplicate paragraph" into lmp-docs
Jean-Luc Brouillet [Fri, 24 Apr 2015 22:59:02 +0000 (15:59 -0700)]
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
Rich Slogar [Mon, 4 May 2015 19:00:19 +0000 (19:00 +0000)]
am
ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
* commit '
ffd0e519299d69b214fb7c96f96f3e34fc2bbf56':
docs: Update Eclipse migrate procedure
Rich Slogar [Mon, 4 May 2015 18:43:38 +0000 (18:43 +0000)]
Merge "docs: Update Eclipse migrate procedure" into lmp-docs
Andrew Solovay [Mon, 4 May 2015 18:26:43 +0000 (18:26 +0000)]
am
fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
* commit '
fbd4af0f9b6614482c846404434af8571bad5817':
Docs: New swipe-to-refresh training guide.
Andrew Solovay [Mon, 4 May 2015 18:12:53 +0000 (18:12 +0000)]
Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
Joe Fernandez [Mon, 4 May 2015 16:57:41 +0000 (16:57 +0000)]
Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs
Joe Fernandez [Sat, 2 May 2015 00:32:39 +0000 (17:32 -0700)]
docs: Android Developer Dashboard update - May 2015
Change-Id: Ia4cfae39c0ccb744f9489615b6dd36f455a652c0
Dirk Dougherty [Sat, 2 May 2015 00:43:53 +0000 (17:43 -0700)]
Update N6 device art port image to remove shadow.
Change-Id: I3d563be3c0c29bc24b06b2019460b27462ac3731
Rich Slogar [Sat, 2 May 2015 00:39:19 +0000 (00:39 +0000)]
am
e7bfe5b3: docs: sdk 24.2.0 revisions
* commit '
e7bfe5b3ccdaa84f94eb30c607d7d6a831d57b7b':
docs: sdk 24.2.0 revisions
Rich Slogar [Fri, 1 May 2015 17:42:45 +0000 (10:42 -0700)]
docs: sdk 24.2.0 revisions
Change-Id: I658ddc34c134741f706d58fd0bbf085ee4724fcf
Luan Nguyen [Fri, 1 May 2015 16:29:01 +0000 (09:29 -0700)]
docs: Refresh Wearable support library reference for Diamond
Change-Id: Id22e676fdda060a954e0d189c90ce11162def08b
Rich Slogar [Fri, 1 May 2015 00:22:14 +0000 (17:22 -0700)]
docs: translation editor update
Change-Id: I64e48bb69b8bfd908e6462536beafc4f238ecc63
Rich Slogar [Thu, 30 Apr 2015 19:59:34 +0000 (12:59 -0700)]
docs: memory monitor duplicate paragraph
Change-Id: I60d6a6da19beba6d3371da304c7ab35a017856f2
Luan Nguyen [Thu, 30 Apr 2015 19:54:57 +0000 (12:54 -0700)]
docs: Add tag heuer logo to wear landing page
bug:
20117464
Change-Id: Iff5c50a477c5e5d29dcaa896527bc413757e1f9d
Rich Slogar [Thu, 30 Apr 2015 17:11:20 +0000 (10:11 -0700)]
docs: overview link to release notes
b/
20719250
Change-Id: I34723beab3aa41aae51a27c2a23fdd91dd9b6bb5
Rich Slogar [Thu, 30 Apr 2015 17:59:46 +0000 (17:59 +0000)]
am
3e70c6b4: Merge "docs: studio 1.2 download link fix" into lmp-docs
* commit '
3e70c6b49ff993aef9fd554ade3444e3d3afa032':
docs: studio 1.2 download link fix
Rich Slogar [Thu, 30 Apr 2015 17:46:17 +0000 (17:46 +0000)]
Merge "docs: studio 1.2 download link fix" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 17:25:56 +0000 (10:25 -0700)]
docs: studio 1.2 download link fix
Change-Id: Ib0234749f64427fbada795a49d2b52d5a67dbd3b
Rich Slogar [Thu, 30 Apr 2015 03:03:15 +0000 (03:03 +0000)]
am
2a3aa2d3: docs: studio 1.2 updates
* commit '
2a3aa2d343820be9e05101a25b955d525e9bfa54':
docs: studio 1.2 updates
Rich Slogar [Thu, 30 Apr 2015 02:57:52 +0000 (02:57 +0000)]
am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
999b08b74c29937b49c4106a784117eed6168045':
docs: studio 1.2 downloads
Rich Slogar [Thu, 30 Apr 2015 02:57:45 +0000 (02:57 +0000)]
am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
07aca646e43ea27329c079d8ff6549127e4fcc25':
docs: plugin 1.2.0 revision updates
Rich Slogar [Thu, 30 Apr 2015 02:57:38 +0000 (02:57 +0000)]
am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
5b7546a67b5fef2adab70d95da4879381b9b0e92':
docs: studio 1.2 revision updates
Rich Slogar [Wed, 18 Mar 2015 22:58:42 +0000 (15:58 -0700)]
docs: studio 1.2 updates
Change-Id: I893af7af0f686d0eeab11f881256c0cf26eb4605
Rich Slogar [Thu, 30 Apr 2015 02:40:25 +0000 (02:40 +0000)]
Merge "docs: studio 1.2 downloads" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 02:39:57 +0000 (02:39 +0000)]
Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 02:39:25 +0000 (02:39 +0000)]
Merge "docs: studio 1.2 revision updates" into lmp-docs
Andrew Solovay [Thu, 30 Apr 2015 02:27:00 +0000 (02:27 +0000)]
Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
Rich Slogar [Thu, 19 Mar 2015 00:33:23 +0000 (17:33 -0700)]
docs: studio 1.2 revision updates
Change-Id: I3bf392596d418b3bba63bbcc09663f2d3f4d6e2a
Rich Slogar [Fri, 3 Apr 2015 22:44:12 +0000 (15:44 -0700)]
docs: studio 1.2 downloads
Change-Id: I43c1d1bad9c110e0e87383ce6ff95ee5706e777e
Rich Slogar [Mon, 30 Mar 2015 20:33:38 +0000 (13:33 -0700)]
docs: plugin 1.2.0 revision updates
Change-Id: Ic58da005e16c4a51dacff741ac3e5a7856ac3edb
Andrew Solovay [Wed, 29 Apr 2015 21:37:22 +0000 (14:37 -0700)]
docs: Minor formatting cleanup.
Code sample had an overlong line, which caused a horizontal scroll-
bar in the generated doc.
Change-Id: I55b0318049be9e4ff473bdc739bb8265ca2da248
Rich Slogar [Wed, 29 Apr 2015 18:08:25 +0000 (11:08 -0700)]
docs: emulator updates
b/
20427070
Change-Id: Ie57ec6a0a0fca2dff13ea3b343f9abfa13cdf8d8
David Friedman [Wed, 29 Apr 2015 03:01:57 +0000 (03:01 +0000)]
am
75f071df: Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
* commit '
75f071df44d3231f2f9d2616277b9065e1dedc12':
Localized Android landing pages Bug:
19124242
David Friedman [Wed, 29 Apr 2015 02:49:23 +0000 (02:49 +0000)]
Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
Rich Slogar [Tue, 16 Dec 2014 02:05:01 +0000 (18:05 -0800)]
docs: Update Eclipse migrate procedure
Change-Id: I6cd292d457a7f2e975ceb0a11086fc5e35a78308
Luan Nguyen [Tue, 28 Apr 2015 18:36:42 +0000 (11:36 -0700)]
docs: Update information on delivering message to clarify that
MessageAPI is not reliable.
bug:
20088602
Change-Id: I2244598e5a155bc6e477d367287b8683ebdf019f
Joe Fernandez [Tue, 28 Apr 2015 16:21:55 +0000 (16:21 +0000)]
Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
Joe Fernandez [Tue, 28 Apr 2015 00:03:49 +0000 (00:03 +0000)]
Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
Joe Fernandez [Tue, 28 Apr 2015 00:00:08 +0000 (00:00 +0000)]
Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
Joe Fernandez [Mon, 27 Apr 2015 22:16:41 +0000 (15:16 -0700)]
docs: Modify Branding guidelines for Android form factors
b/
19835619
Change-Id: Ic942aa3c262de5922e084b1e007652b151ca2a76
Luan Nguyen [Wed, 22 Apr 2015 21:48:46 +0000 (14:48 -0700)]
docs: Update Wearable API setup to mention addApiIfAvailable().
bug:
20486912
Change-Id: Ie5fe89b5bd0bbed5c95cead301c6eb6278bfdaee