OSDN Git Service

android-x86/frameworks-base.git
9 years agoam d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear...
Luan Nguyen [Tue, 21 Apr 2015 15:24:36 +0000 (15:24 +0000)]
am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

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

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

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

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 6f142008: am 220f360e: am 900831f3: docs: Added 3rd-party Javadocs for Android...
Quddus Chong [Mon, 20 Apr 2015 23:15:17 +0000 (23:15 +0000)]
am 6f142008: am 220f360e: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

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

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

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

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 agoam 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribu...
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:44:42 +0000 (00:44 +0000)]
am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '38d969c5c85f930cefef6f2fcad99d5aa8a0d5f7':
  doc: Add Korean version of DAC/distribute/ page.

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

* commit '558907f702ab21d4166d5d7f7986cb18c4a993bd':
  doc: Add Korean version of DAC/distribute/ page.

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 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page...
Dirk Dougherty [Sat, 18 Apr 2015 23:43:54 +0000 (23:43 +0000)]
am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '1696552f127c82aed9036eb1fa6b44c826d57eec':
  Doc change: distribute landing page.

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

* commit '6e141199874f0c5603dee4fccc728412dad07d61':
  Doc change: distribute landing page.

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 agoMerge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into...
Sean Wan [Fri, 17 Apr 2015 23:45:37 +0000 (23:45 +0000)]
Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev

9 years agoDO NOT MERGE: Make wifi scan interval when disconnected configurable.
Sean Wan [Tue, 14 Apr 2015 21:26:40 +0000 (14:26 -0700)]
DO NOT MERGE: Make wifi scan interval when disconnected configurable.

Bug: 19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44

9 years agoam 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog...
Rich Slogar [Fri, 17 Apr 2015 17:27:13 +0000 (17:27 +0000)]
am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit '71a616e05065e39a5a13b483b031a2040dc52eda':
  docs: studio remove gradle tasks dialog

9 years agoam 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into...
Rich Slogar [Fri, 17 Apr 2015 17:27:07 +0000 (17:27 +0000)]
am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit '61dd1dfda1e3f9d2c58a5d1719818b66134cadb9':
  docs: hierarchyviewer updates

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

* commit '203a47395dfc17ba9e9b6b46c65bfbde002312f6':
  docs: studio remove gradle tasks dialog

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

* commit '684f3aa264e678affc1b33b27602493c96ee7eac':
  docs: hierarchyviewer updates

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 agoHold a wake lock while dozing when wallpaper draws.
Filip Gruszczynski [Thu, 16 Apr 2015 20:18:58 +0000 (13:18 -0700)]
Hold a wake lock while dozing when wallpaper draws.

This mimics what ViewRootImpl does before drawing.

Bug: 20242788
Change-Id: If85ad17113636f74267aedb3af04d0281b57ac0e

9 years agoam f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp...
Deepanshu Gupta [Thu, 16 Apr 2015 17:31:34 +0000 (17:31 +0000)]
am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev

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

9 years agoam cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
Deepanshu Gupta [Thu, 16 Apr 2015 17:19:42 +0000 (17:19 +0000)]
am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev

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

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 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 agoam 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material...
Joe Fernandez [Wed, 15 Apr 2015 00:45:20 +0000 (00:45 +0000)]
am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs

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

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

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

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 c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed...
Dirk Dougherty [Tue, 14 Apr 2015 04:43:06 +0000 (04:43 +0000)]
am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs

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

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

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

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 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage...
Mathieu Chartier [Mon, 13 Apr 2015 21:10:29 +0000 (21:10 +0000)]
am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs

* commit '2c871d2cce8e926c5300fdee33526eeb5e81810c':
  Update "Investigating your RAM usage" for ART

9 years agoam 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton...
smain@google.com [Mon, 13 Apr 2015 21:10:15 +0000 (21:10 +0000)]
am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs

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

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

* commit '17781b68df70a9c0bc446d91739be651d4c9a9e3':
  Update "Investigating your RAM usage" for ART

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

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

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 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs
Rich Slogar [Mon, 13 Apr 2015 18:53:14 +0000 (18:53 +0000)]
am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs

* commit '12020cf4418fd5b0918b6df1d6a072be01aac622':
  docs: systrace update

9 years agoam 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into...
Rich Slogar [Mon, 13 Apr 2015 18:53:08 +0000 (18:53 +0000)]
am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs

* commit '8f68c77cec98a24fd43ad0a5e2d3946d2a16e15e':
  docs: nexus usb driver update

9 years agoam 6843ae30: am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into...
Rich Slogar [Mon, 13 Apr 2015 18:53:01 +0000 (18:53 +0000)]
am 6843ae30: am c0559808: am a7ade2f7: Merge "docs: remove adb install option" into lmp-docs

* commit '6843ae308ea8d62aa44dda3e7ad95c6e292513af':
  docs: remove adb install option

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

* commit '3e664c3bda8ee1cb3b2819ba38a8195147ad448a':
  docs: systrace update

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

* commit '6656ea4607d8250a611eddb07de890213ea31426':
  docs: nexus usb driver update

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

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

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 agoam dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into...
Mathieu Chartier [Mon, 13 Apr 2015 17:47:24 +0000 (17:47 +0000)]
am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev

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

9 years agoam f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev
Mathieu Chartier [Mon, 13 Apr 2015 17:37:44 +0000 (17:37 +0000)]
am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev

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

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 agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Apr 2015 06:07:04 +0000 (23:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: I239fc7724d745a1abbac73e673ecfe408ce17c9b
Auto-generated-cl: translation import

9 years agoam 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different...
David Friedman [Sat, 11 Apr 2015 02:05:57 +0000 (02:05 +0000)]
am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs

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

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

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

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 agoAllow going to home action to work for SHORT_PRESS_POWER_GO_HOME with
Bryce Lee [Thu, 9 Apr 2015 20:10:33 +0000 (13:10 -0700)]
Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with
keyguard enabled.

Bug: 20037090
Change-Id: I613f3278a234e3961cb4be1976da0f821aebfc1f

9 years agoam 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings...
Rich Slogar [Thu, 9 Apr 2015 18:11:24 +0000 (18:11 +0000)]
am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs

* commit '2489a7fd5fbafde339ac58f2f1e7a5854e7e4936':
  docs: remove studio proguard settings from play services

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

* commit '9d6e95879aff4608db400c270fa8f89b6b55d0e6':
  docs: remove studio proguard settings from play services

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 agoam a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed...
Quddus Chong [Wed, 8 Apr 2015 18:48:57 +0000 (18:48 +0000)]
am a147451a: am c61fd055: 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 'a147451ab92e29141cd85d5c75a881586d5959df':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e

9 years agoam c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in...
Quddus Chong [Wed, 8 Apr 2015 18:38:47 +0000 (18:38 +0000)]
am c61fd055: 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 'c61fd05581a80bcecf50509acb220ea3e2817e56':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e

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 agoam c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey...
Quddus Chong [Wed, 8 Apr 2015 18:11:55 +0000 (18:11 +0000)]
am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev

* commit 'c736e8cf41445e7a32721da617d6d7eacd189703':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873

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 agoam f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method descrip...
Quddus Chong [Wed, 8 Apr 2015 17:53:44 +0000 (17:53 +0000)]
am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev

* commit 'f0ab39c10b614514ba4a600aa6fd4354253cde73':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873

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 8ba1380f: am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs
Eric Gilmore [Wed, 8 Apr 2015 00:53:50 +0000 (00:53 +0000)]
am 8ba1380f: am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs

* commit '8ba1380fb59d3b7adec7e99f354eccabcead65b6':
  Fixing date.

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

* commit 'a4f72eb079938bed57e8183e8110da044fe03429':
  Fixing date.

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 agoam 90bf99b1: am 922946ea: am a0c887c6: docs: Fixed typo in Implementing In-app Billin...
Quddus Chong [Tue, 7 Apr 2015 19:19:48 +0000 (19:19 +0000)]
am 90bf99b1: am 922946ea: am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296

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

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

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