OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 2a3aa2d3: docs: studio 1.2 updates
Rich Slogar [Thu, 30 Apr 2015 03:01:14 +0000 (03:01 +0000)]
am 2a3aa2d3: docs: studio 1.2 updates

* commit '2a3aa2d343820be9e05101a25b955d525e9bfa54':
  docs: studio 1.2 updates

9 years agoam 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 02:53:22 +0000 (02:53 +0000)]
am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs

* commit '999b08b74c29937b49c4106a784117eed6168045':
  docs: studio 1.2 downloads

9 years agoam 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 02:53:17 +0000 (02:53 +0000)]
am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs

* commit '07aca646e43ea27329c079d8ff6549127e4fcc25':
  docs: plugin 1.2.0 revision updates

9 years agoam 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 02:53:13 +0000 (02:53 +0000)]
am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs

* commit '5b7546a67b5fef2adab70d95da4879381b9b0e92':
  docs: studio 1.2 revision updates

9 years agodocs: studio 1.2 updates
Rich Slogar [Wed, 18 Mar 2015 22:58:42 +0000 (15:58 -0700)]
docs: studio 1.2 updates

Change-Id: I893af7af0f686d0eeab11f881256c0cf26eb4605

9 years agoMerge "docs: studio 1.2 downloads" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 02:40:25 +0000 (02:40 +0000)]
Merge "docs: studio 1.2 downloads" into lmp-docs

9 years agoMerge "docs: plugin 1.2.0 revision updates" 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

9 years agoMerge "docs: studio 1.2 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

9 years agodocs: studio 1.2 revision updates
Rich Slogar [Thu, 19 Mar 2015 00:33:23 +0000 (17:33 -0700)]
docs: studio 1.2 revision updates

Change-Id: I3bf392596d418b3bba63bbcc09663f2d3f4d6e2a

9 years agodocs: studio 1.2 downloads
Rich Slogar [Fri, 3 Apr 2015 22:44:12 +0000 (15:44 -0700)]
docs: studio 1.2 downloads

Change-Id: I43c1d1bad9c110e0e87383ce6ff95ee5706e777e

9 years agodocs: plugin 1.2.0 revision updates
Rich Slogar [Mon, 30 Mar 2015 20:33:38 +0000 (13:33 -0700)]
docs: plugin 1.2.0 revision updates

Change-Id: Ic58da005e16c4a51dacff741ac3e5a7856ac3edb

9 years agoam 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
David Friedman [Wed, 29 Apr 2015 03:01:10 +0000 (03:01 +0000)]
am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit '75f071df44d3231f2f9d2616277b9065e1dedc12':
  Localized Android landing pages Bug: 19124242

9 years agoMerge "Localized Android landing pages Bug: 19124242" into lmp-docs
David Friedman [Wed, 29 Apr 2015 02:49:23 +0000 (02:49 +0000)]
Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

9 years agoam 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android...
Scott Rowe [Fri, 24 Apr 2015 18:01:15 +0000 (18:01 +0000)]
am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

* commit '02e4f2fbe6e0511789d42d5942548158d2dd154f':
  docs: Supported media protocols, codecs, formats for Android TV

9 years agoMerge "docs: Supported media protocols, codecs, formats for Android TV" into lmp...
Scott Rowe [Fri, 24 Apr 2015 17:49:13 +0000 (17:49 +0000)]
Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

9 years agoam 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitma...
Leon Scroggins III [Fri, 24 Apr 2015 17:15:55 +0000 (17:15 +0000)]
am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '67326bcba0f7287367dedba4caaf2a168a43f057':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO...
Leon Scroggins III [Fri, 24 Apr 2015 17:15:43 +0000 (17:15 +0000)]
am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '16ac8ad7fac73524b5296f955884bd2aec405ded':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings....
Andrew Solovay [Thu, 23 Apr 2015 20:18:51 +0000 (20:18 +0000)]
am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs

* commit '5b3152cffcd90441ca4cacdf5596e9bb3428af08':
  Docs: Correcting section on how to escape quotes in strings.

9 years agoMerge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
Andrew Solovay [Thu, 23 Apr 2015 20:06:29 +0000 (20:06 +0000)]
Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs

9 years agoam 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent...
Andrew Solovay [Thu, 23 Apr 2015 18:31:59 +0000 (18:31 +0000)]
am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs

* commit '09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
  docs: Update to doc on listening for restrictions-changed intent

9 years agoMerge "docs: Update to doc on listening for restrictions-changed intent" into lmp...
Andrew Solovay [Thu, 23 Apr 2015 18:20:06 +0000 (18:20 +0000)]
Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs

9 years agoam ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromP...
Leon Scroggins III [Thu, 23 Apr 2015 16:41:49 +0000 (16:41 +0000)]
am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit 'ea2dcda788e035ccdc55ab16303c9e34740a3f8c':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check...
Leon Scroggins III [Thu, 23 Apr 2015 16:29:22 +0000 (16:29 +0000)]
am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit 'ee35410ff8297b1ab39f3e546ebcedc27300a7de':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO...
Leon Scroggins III [Thu, 23 Apr 2015 16:20:02 +0000 (16:20 +0000)]
am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit 'a7501119e341626536ce12c3539c2f9a986a2945':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 15:53:24 +0000 (15:53 +0000)]
am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '4a6ca6724c789603626d74a8cc187365788a6cfd':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoam 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 15:48:12 +0000 (15:48 +0000)]
am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '69b8e962e1b8346b33a2c14889547a0ac00c8b17':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE

9 years agoMerge "DO NOT MERGE Don't take flags when creating app widget config activity." into...
Svet Ganov [Thu, 23 Apr 2015 15:09:46 +0000 (15:09 +0000)]
Merge "DO NOT MERGE Don't take flags when creating app widget config activity." into lmp-mr1-dev

9 years agoam f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into...
Quddus Chong [Wed, 22 Apr 2015 23:48:00 +0000 (23:48 +0000)]
am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs

* commit 'f0936e2fb0e9f013f6079e7a733a41d42d49c3f3':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.

9 years agoam 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into...
Quddus Chong [Wed, 22 Apr 2015 23:47:55 +0000 (23:47 +0000)]
am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit '789c59711e55be981ed2093228ded0c588e74ba0':
  docs: Added What's New section for GMS v7.3 (Parmesan).

9 years agoMerge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
Quddus Chong [Wed, 22 Apr 2015 23:38:20 +0000 (23:38 +0000)]
Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs

9 years agoMerge "docs: Added What's New section for GMS v7.3 (Parmesan)." into lmp-docs
Quddus Chong [Wed, 22 Apr 2015 23:37:32 +0000 (23:37 +0000)]
Merge "docs: Added What's New section for GMS v7.3 (Parmesan)." into lmp-docs

9 years agodocs: Added What's New section for GMS v7.3 (Parmesan).
Quddus Chong [Thu, 16 Apr 2015 16:07:28 +0000 (09:07 -0700)]
docs: Added What's New section for GMS v7.3 (Parmesan).

Change-Id: Ie56171262f866b1f312db5cefaec849353a1c541

9 years agoam 33ac358a: docs: Add Wear Capability training
Luan Nguyen [Tue, 21 Apr 2015 22:40:59 +0000 (22:40 +0000)]
am 33ac358a: docs: Add Wear Capability training

* commit '33ac358a5a4199549d11ba1931243e7dc8a7ab85':
  docs: Add Wear Capability training

9 years agodocs: Add Wear Capability training
Luan Nguyen [Tue, 14 Apr 2015 15:54:22 +0000 (08:54 -0700)]
docs: Add Wear Capability training

bug: 20088602
Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0

9 years agoam 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
Luan Nguyen [Tue, 21 Apr 2015 15:00:56 +0000 (15:00 +0000)]
am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit '4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
  docs: Add Channel API summary for Wear.

9 years agoMerge "docs: Add Channel API summary for Wear." into lmp-docs
Luan Nguyen [Tue, 21 Apr 2015 14:53:02 +0000 (14:53 +0000)]
Merge "docs: Add Channel API summary for Wear." into lmp-docs

9 years agoam 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0...
Quddus Chong [Mon, 20 Apr 2015 22:51:40 +0000 (22:51 +0000)]
am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit '900831f303beb4a67a871d969ac822d8b6d36460':
  docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

9 years agodocs: Added 3rd-party Javadocs for Android Support Testing Library v0.2.
Quddus Chong [Fri, 17 Apr 2015 22:01:16 +0000 (15:01 -0700)]
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2.
bug: 20304402

Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a

9 years agodocs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Mon, 13 Apr 2015 22:16:55 +0000 (15:16 -0700)]
docs: Added 3rd-party Javadocs for GMS Parmesan release.

Change-Id: Ia133c7267e500969310524369d34ab07c6aaa854

9 years agoDO NOT MERGE Don't take flags when creating app widget config activity.
Svet Ganov [Mon, 20 Apr 2015 15:28:30 +0000 (08:28 -0700)]
DO NOT MERGE Don't take flags when creating app widget config activity.

bug:19618745

Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095

9 years agoam 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:22:51 +0000 (00:22 +0000)]
am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '0d2f280310458d23618edf6550818f8f9cfa6b47':
  doc: Add Korean version of DAC/distribute/ page.

9 years agoMerge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:15:09 +0000 (00:15 +0000)]
Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

9 years agoam ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Sat, 18 Apr 2015 23:22:48 +0000 (23:22 +0000)]
am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit 'ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
  Doc change: distribute landing page.

9 years agoMerge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Sat, 18 Apr 2015 23:11:40 +0000 (23:11 +0000)]
Merge "Doc change: distribute landing page." into lmp-docs

9 years agoDoc change: distribute landing page.
Dirk Dougherty [Mon, 10 Nov 2014 19:50:41 +0000 (11:50 -0800)]
Doc change: distribute landing page.

Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be

9 years agoam 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
Rich Slogar [Fri, 17 Apr 2015 17:03:04 +0000 (17:03 +0000)]
am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit '1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
  docs: studio remove gradle tasks dialog

9 years agoam efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
Rich Slogar [Fri, 17 Apr 2015 17:02:59 +0000 (17:02 +0000)]
am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit 'efe861a4a7081da795fe6a0843308ca7cef26277':
  docs: hierarchyviewer updates

9 years agoMerge "docs: studio remove gradle tasks dialog" into lmp-docs
Rich Slogar [Fri, 17 Apr 2015 16:53:33 +0000 (16:53 +0000)]
Merge "docs: studio remove gradle tasks dialog" into lmp-docs

9 years agoMerge "docs: hierarchyviewer updates" into lmp-docs
Rich Slogar [Fri, 17 Apr 2015 16:52:44 +0000 (16:52 +0000)]
Merge "docs: hierarchyviewer updates" into lmp-docs

9 years agodocs: Add Channel API summary for Wear.
Luan Nguyen [Mon, 13 Apr 2015 18:02:32 +0000 (11:02 -0700)]
docs: Add Channel API summary for Wear.

bug: 20089257
Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb

9 years agodoc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Tue, 14 Apr 2015 09:44:35 +0000 (18:44 +0900)]
doc: Add Korean version of DAC/distribute/ page.

Bug: 20204101
Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb

9 years agoMerge changes from topic 'layoutlib-api-15' into lmp-mr1-dev
Deepanshu Gupta [Thu, 16 Apr 2015 17:12:41 +0000 (17:12 +0000)]
Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev

* changes:
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.

9 years agoMake Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Wed, 11 Mar 2015 17:12:06 +0000 (13:12 -0400)]
Make Bitmap_createFromParcel check the color count. DO NOT MERGE

When reading from the parcel, if the number of colors is invalid, early
exit.

Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.

Also use an auto-deleter to handle deletion of the SkBitmap.

Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6

BUG=19666945

Change-Id: Iab0d218c41ae0c39606e333e44cda078eef32291

9 years agoUpdate golden image for tests.
Deepanshu Gupta [Wed, 15 Apr 2015 00:26:09 +0000 (17:26 -0700)]
Update golden image for tests.

Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03

9 years agoUpdate to using LayoutlibCallback.
Deepanshu Gupta [Tue, 14 Apr 2015 23:39:41 +0000 (16:39 -0700)]
Update to using LayoutlibCallback.

Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac

9 years agoRemove implementation of deprecated method.
Deepanshu Gupta [Tue, 14 Apr 2015 22:17:07 +0000 (15:17 -0700)]
Remove implementation of deprecated method.

BridgeResources.getDrawable(int) is not needed anymore, since the super
method is deprecated and it calls the alternative
getDrawable(int, Theme), which we override.

Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847

9 years agoAdd @empty support.
Deepanshu Gupta [Mon, 30 Mar 2015 21:53:38 +0000 (14:53 -0700)]
Add @empty support.

Bug: http://b.android.com/162428
Change-Id: Id7a981de2fce21213e12cdabcce4104f146fd4d3

9 years agodocs: hierarchyviewer updates
Rich Slogar [Tue, 31 Mar 2015 23:49:01 +0000 (16:49 -0700)]
docs: hierarchyviewer updates

b/19955159

Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715

9 years agodocs: studio remove gradle tasks dialog
Rich Slogar [Wed, 11 Feb 2015 00:18:59 +0000 (16:18 -0800)]
docs: studio remove gradle tasks dialog

Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e

9 years agoMake Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Wed, 15 Apr 2015 12:16:29 +0000 (08:16 -0400)]
Make Bitmap_createFromParcel check the color count. DO NOT MERGE

When reading from the parcel, if the number of colors is invalid, early
exit.

Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.

Also use an auto-deleter to handle deletion of the SkBitmap.

Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6

BUG=19666945

Change-Id: I9490d90244e051a4019d6266b2a1cb375a65198f

9 years agoam af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp...
Joe Fernandez [Tue, 14 Apr 2015 20:04:56 +0000 (20:04 +0000)]
am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs

* commit 'af5f200038d377033a5c22e6f93bc49a9e67444d':
  docs: Add Cross-References to Material Design Spec

9 years agoMerge "docs: Add Cross-References to Material Design Spec" into lmp-docs
Joe Fernandez [Tue, 14 Apr 2015 19:55:35 +0000 (19:55 +0000)]
Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs

9 years agodocs: Add Cross-References to Material Design Spec
Joe Fernandez [Fri, 3 Apr 2015 06:48:38 +0000 (23:48 -0700)]
docs: Add Cross-References to Material Design Spec

Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c

9 years agoam 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp...
Dirk Dougherty [Tue, 14 Apr 2015 04:22:27 +0000 (04:22 +0000)]
am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs

* commit '00f857c5a132555774bd286c254dade281473427':
  Doc change: add new pages for Designed for Families.

9 years agoMerge "Doc change: add new pages for Designed for Families." into lmp-docs
Dirk Dougherty [Tue, 14 Apr 2015 04:12:56 +0000 (04:12 +0000)]
Merge "Doc change: add new pages for Designed for Families." into lmp-docs

9 years agoDoc change: add new pages for Designed for Families.
Dirk Dougherty [Wed, 1 Apr 2015 03:11:16 +0000 (20:11 -0700)]
Doc change: add new pages for Designed for Families.

Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808

9 years agoam 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs
Mathieu Chartier [Mon, 13 Apr 2015 20:52:51 +0000 (20:52 +0000)]
am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs

* commit '473989c35d9f0a42c6e7d3a56004dc76676b65b5':
  Update "Investigating your RAM usage" for ART

9 years agoam d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp...
smain@google.com [Mon, 13 Apr 2015 20:44:52 +0000 (20:44 +0000)]
am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs

* commit 'd60649c541931a5a9e5972cdceac48b9042eaff4':
  initial batch of NDK files for skeleton site build

9 years agoMerge "Update "Investigating your RAM usage" for ART" into lmp-docs
Mathieu Chartier [Mon, 13 Apr 2015 20:44:17 +0000 (20:44 +0000)]
Merge "Update "Investigating your RAM usage" for ART" into lmp-docs

9 years agoMerge "initial batch of NDK files for skeleton site build" into lmp-docs
smain@google.com [Mon, 13 Apr 2015 20:32:37 +0000 (20:32 +0000)]
Merge "initial batch of NDK files for skeleton site build" into lmp-docs

9 years agoinitial batch of NDK files for skeleton site build
smain@google.com [Sat, 11 Apr 2015 03:45:28 +0000 (20:45 -0700)]
initial batch of NDK files for skeleton site build

Change-Id: I00152e817377c072f529940743499a3b6d91f80d

9 years agoam bdc20109: Merge "docs: systrace update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:30:38 +0000 (18:30 +0000)]
am bdc20109: Merge "docs: systrace update" into lmp-docs

* commit 'bdc20109208d16144cd052b281e25e6e243b2547':
  docs: systrace update

9 years agoam 880460a7: Merge "docs: nexus usb driver update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:30:33 +0000 (18:30 +0000)]
am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs

* commit '880460a704c79b0d81c1aa8af9b3c163c8adf16d':
  docs: nexus usb driver update

9 years agoam a7ade2f7: Merge "docs: remove adb install option" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:30:29 +0000 (18:30 +0000)]
am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs

* commit 'a7ade2f7f0c496cb12edfc4ae805fd08c9c2359d':
  docs: remove adb install option

9 years agoMerge "docs: systrace update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:14:04 +0000 (18:14 +0000)]
Merge "docs: systrace update" into lmp-docs

9 years agoMerge "docs: nexus usb driver update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:13:46 +0000 (18:13 +0000)]
Merge "docs: nexus usb driver update" into lmp-docs

9 years agoMerge "docs: remove adb install option" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:13:09 +0000 (18:13 +0000)]
Merge "docs: remove adb install option" into lmp-docs

9 years agoUpdate "Investigating your RAM usage" for ART
Mathieu Chartier [Mon, 23 Mar 2015 22:58:11 +0000 (15:58 -0700)]
Update "Investigating your RAM usage" for ART

Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
(cherry picked from commit d92c6bde3fc61e1ea90c54e4fd19d72f0b1a3987)

9 years agoMerge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev
Mathieu Chartier [Mon, 13 Apr 2015 17:29:00 +0000 (17:29 +0000)]
Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev

9 years agoam 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK...
David Friedman [Sat, 11 Apr 2015 01:46:19 +0000 (01:46 +0000)]
am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs

* commit '3a77a8aeea1a40ca5c2cdb0b66a877032118d89f':
  New build rule reflecting different masthead, side nav for NDK minisite.

9 years agoMerge "New build rule reflecting different masthead, side nav for NDK minisite."...
David Friedman [Sat, 11 Apr 2015 01:36:56 +0000 (01:36 +0000)]
Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs

9 years agoUpdate "Investigating your RAM usage" for ART
Mathieu Chartier [Mon, 23 Mar 2015 22:58:11 +0000 (15:58 -0700)]
Update "Investigating your RAM usage" for ART

Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56

9 years agoam 36e3f512: Merge "docs: remove studio proguard settings from play services" into...
Rich Slogar [Thu, 9 Apr 2015 17:47:40 +0000 (17:47 +0000)]
am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs

* commit '36e3f5125895875c63242294da289ca4b09c9f9e':
  docs: remove studio proguard settings from play services

9 years agoMerge "docs: remove studio proguard settings from play services" into lmp-docs
Rich Slogar [Thu, 9 Apr 2015 17:39:28 +0000 (17:39 +0000)]
Merge "docs: remove studio proguard settings from play services" into lmp-docs

9 years agoDocs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Thu, 2 Apr 2015 22:10:51 +0000 (15:10 -0700)]
Docs: Correcting section on how to escape quotes in strings.

The behavior for single and double-quotes is different--I expanded
this section to note how they differ.

(New version of a Gerrit CL I abandoned because of a commit mess-up.)

See first comment for doc stage location.

bug: 19959941
Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26

9 years agoam ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation...
Quddus Chong [Wed, 8 Apr 2015 18:27:56 +0000 (18:27 +0000)]
am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs

* commit 'ff4c632592cce177997d63b3ff81c0b2be9cf9bb':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e

9 years agoMerge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey...
Quddus Chong [Wed, 8 Apr 2015 18:16:56 +0000 (18:16 +0000)]
Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs

9 years agocherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() metho...
Quddus Chong [Tue, 7 Apr 2015 20:03:29 +0000 (13:03 -0700)]
cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description.
bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e

Change-Id: I48d1e2f8e1f7d94dffac61a274f9c1a2df31a822

9 years agoMerge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug...
Quddus Chong [Wed, 8 Apr 2015 17:46:20 +0000 (17:46 +0000)]
Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev

9 years agoam aac938a8: Merge "Fixing date." into lmp-docs
Eric Gilmore [Wed, 8 Apr 2015 00:33:07 +0000 (00:33 +0000)]
am aac938a8: Merge "Fixing date." into lmp-docs

* commit 'aac938a8597efb8d71ce7dc124779f1d268510eb':
  Fixing date.

9 years agoMerge "Fixing date." into lmp-docs
Eric Gilmore [Wed, 8 Apr 2015 00:05:27 +0000 (00:05 +0000)]
Merge "Fixing date." into lmp-docs

9 years agoFixed broken link in UiAutomation.setRunAsMonkey() method description.
Quddus Chong [Tue, 7 Apr 2015 20:03:29 +0000 (13:03 -0700)]
Fixed broken link in UiAutomation.setRunAsMonkey() method description.
bug: 19711873

Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e

9 years agoFixing date.
Eric Gilmore [Tue, 7 Apr 2015 18:58:52 +0000 (11:58 -0700)]
Fixing date.

Change-Id: Ia406bec97cda0ae309abbb8c538ad4ea3b4e9d42

9 years agoam a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
Quddus Chong [Tue, 7 Apr 2015 18:58:07 +0000 (18:58 +0000)]
am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296

* commit 'a0c887c67e5d925247fcb77d714ccc3383c0d0da':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296

9 years agodocs: Fixed typo in Implementing In-app Billing guide.
Quddus Chong [Tue, 7 Apr 2015 18:37:34 +0000 (11:37 -0700)]
docs: Fixed typo in Implementing In-app Billing guide.
bug: 19961296

Change-Id: If170b58feb6d7160790591b540cdb91d7c23d6e5

9 years agoNew build rule reflecting different masthead, side nav for NDK minisite.
David Friedman [Tue, 7 Apr 2015 18:45:54 +0000 (11:45 -0700)]
New build rule reflecting different masthead, side nav for NDK minisite.

Change-Id: I81b50cca405d907cf8a6514356b92e38b6808d3c

9 years agoam 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during...
Quddus Chong [Tue, 7 Apr 2015 18:40:32 +0000 (18:40 +0000)]
am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs

* commit '0307acf90773a16faa6b33dad12b14b95708a3cc':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293

9 years agoMerge "docs: Removed instruction to add gms version in manifest during Google Play...
Quddus Chong [Tue, 7 Apr 2015 18:31:44 +0000 (18:31 +0000)]
Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs

9 years agoam 95c39774: docs: Small fix for Android Dashboard
Joe Fernandez [Tue, 7 Apr 2015 18:31:03 +0000 (18:31 +0000)]
am 95c39774: docs: Small fix for Android Dashboard

* commit '95c39774d245921be04b2a6f0f221f86545f8ac6':
  docs: Small fix for Android Dashboard

9 years agodocs: Removed instruction to add gms version in manifest during Google Play services...
Quddus Chong [Tue, 7 Apr 2015 18:16:38 +0000 (11:16 -0700)]
docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this.
bug: 20077293

Change-Id: Ie1148e751b9d22e5e7a1abad819c19a4c0b9c6b7