OSDN Git Service
Deepanshu Gupta [Wed, 6 May 2015 23:43:09 +0000 (23:43 +0000)]
Merge "More layoutlib tests." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:54 +0000 (23:42 +0000)]
Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-dev
Diego Perez [Wed, 6 May 2015 23:42:33 +0000 (23:42 +0000)]
Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:19 +0000 (23:42 +0000)]
Merge "Nullity annotations to some tests." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:42:00 +0000 (23:42 +0000)]
Merge "Fix title bar showing when not required." into lmp-mr1-dev
Deepanshu Gupta [Wed, 6 May 2015 23:41:35 +0000 (23:41 +0000)]
Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
Andrew Solovay [Mon, 4 May 2015 18:27:33 +0000 (18:27 +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
Rich Slogar [Sat, 2 May 2015 00:38:59 +0000 (00:38 +0000)]
am
e7bfe5b3: docs: sdk 24.2.0 revisions
* commit '
e7bfe5b3ccdaa84f94eb30c607d7d6a831d57b7b':
docs: sdk 24.2.0 revisions
Deepanshu Gupta [Wed, 29 Apr 2015 17:44:51 +0000 (10:44 -0700)]
LayoutLib: fix crash when shadow size <=0.
Drawing empty rects results in IllegalArgumentException on Mac JRE 1.6.
Prevent that by checking the bounds before attempting to draw the rect.
Bug:
20687353
Change-Id: I45f48ee125196480bb6510cc49b24d2122bc3e48
Rich Slogar [Fri, 1 May 2015 17:42:45 +0000 (10:42 -0700)]
docs: sdk 24.2.0 revisions
Change-Id: I658ddc34c134741f706d58fd0bbf085ee4724fcf
Rich Slogar [Thu, 30 Apr 2015 17:59:51 +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:01:14 +0000 (03:01 +0000)]
am
2a3aa2d3: docs: studio 1.2 updates
* commit '
2a3aa2d343820be9e05101a25b955d525e9bfa54':
docs: studio 1.2 updates
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
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
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
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
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
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
David Friedman [Wed, 29 Apr 2015 02:49:23 +0000 (02:49 +0000)]
Merge "Localized Android landing pages Bug:
19124242" into lmp-docs
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
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
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
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
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.
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
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
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
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
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
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
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
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
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
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.
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).
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
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
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
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
Luan Nguyen [Tue, 14 Apr 2015 15:54:22 +0000 (08:54 -0700)]
docs: Add Wear Capability training
bug:
20088602
Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0
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.
Luan Nguyen [Tue, 21 Apr 2015 14:53:02 +0000 (14:53 +0000)]
Merge "docs: Add Channel API summary for Wear." into lmp-docs
Diego Perez [Tue, 21 Apr 2015 10:33:55 +0000 (11:33 +0100)]
Fix isThemeAppCompat NPE when using an invalid theme
When the theme does not longer exists on the Android Studio side,
getDefaultTheme will return null causing isThemeAppCompat to crash.
Change-Id: I5a5c17126dce72e9872522643219b9438666bc04
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
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
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
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
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.
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
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.
Dirk Dougherty [Sat, 18 Apr 2015 23:11:40 +0000 (23:11 +0000)]
Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Mon, 10 Nov 2014 19:50:41 +0000 (11:50 -0800)]
Doc change: distribute landing page.
Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be
Joe Malin [Thu, 13 Feb 2014 18:39:47 +0000 (10:39 -0800)]
Docs: New swipe-to-refresh training guide.
Doc-in-progress inherited from xoogler's (unfinished) CL
http://ag/427505 . See comments for staging location.
Patch set 1 is the version inherited from the xoogler; PS2 is after
my edits. Per a conversation with CB, I've removed the "ListFragment"
doc, and just put in a note about that topic in the
"add-swipe-refresh" doc.
Change-Id: Id1a1294b15c5a7363f650ea13237948b0effbc40
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
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
Rich Slogar [Fri, 17 Apr 2015 16:53:33 +0000 (16:53 +0000)]
Merge "docs: studio remove gradle tasks dialog" into lmp-docs
Rich Slogar [Fri, 17 Apr 2015 16:52:44 +0000 (16:52 +0000)]
Merge "docs: hierarchyviewer updates" into lmp-docs
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
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
Deepanshu Gupta [Thu, 16 Apr 2015 22:37:28 +0000 (15:37 -0700)]
More layoutlib tests.
- Add another layout including more widgets and thus testing layoutlib
better.
- Update targetSdk Version to 22.
- Handling of dynamic ids (@+id/) in LayoutLibTestCallback is buggy.
Since this is not a problem in Studio, and this is not testing the
callback, work around the issue by declaring the ids in
values/ids.xml.
Change-Id: I457c105e8556c4df13cd86da2250fe5fd37843a8
Deepanshu Gupta [Mon, 30 Mar 2015 22:01:03 +0000 (15:01 -0700)]
RecyclerView in LayoutLib: better XML attrs.
- RecyclerView now supports XML attributes natively. Thus, remove the
custom support via tools attribute. Users with older versions of
RecyclerView should update.
- Add Context.getPackageName() support used by RecyclerView.
- Update SessionParamsFlags with the new changes and rename it to
RenderParamsFlags.
The attribute behaves slightly different from the original tools
attribute. For usage, see commit
044b5b61e96 in frameworks/support.
Change-Id: I12073e37a2ba411558ca1d3e30c399e3d9a0b144
Deepanshu Gupta [Thu, 16 Apr 2015 00:54:34 +0000 (17:54 -0700)]
Nullity annotations to some tests.
Change-Id: I2939d7fab30f3b8fe32f2fdf720c630d677373ff
Deepanshu Gupta [Thu, 16 Apr 2015 18:54:18 +0000 (11:54 -0700)]
Fix title bar showing when not required.
Bug: http://b.android.com/166383
Change-Id: I5ea051ffdbf9a2d73a83f62d56a0f4006b014348
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.
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
Deepanshu Gupta [Wed, 15 Apr 2015 00:26:09 +0000 (17:26 -0700)]
Update golden image for tests.
Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03
Deepanshu Gupta [Tue, 14 Apr 2015 23:39:41 +0000 (16:39 -0700)]
Update to using LayoutlibCallback.
Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
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
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
Rich Slogar [Tue, 31 Mar 2015 23:49:01 +0000 (16:49 -0700)]
docs: hierarchyviewer updates
b/
19955159
Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
Rich Slogar [Wed, 11 Feb 2015 00:18:59 +0000 (16:18 -0800)]
docs: studio remove gradle tasks dialog
Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
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
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
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
Joe Fernandez [Fri, 3 Apr 2015 06:48:38 +0000 (23:48 -0700)]
docs: Add Cross-References to Material Design Spec
Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c
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.
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
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
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
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
Mathieu Chartier [Mon, 13 Apr 2015 20:44:17 +0000 (20:44 +0000)]
Merge "Update "Investigating your RAM usage" for ART" 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
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
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
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
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
Rich Slogar [Mon, 13 Apr 2015 18:14:04 +0000 (18:14 +0000)]
Merge "docs: systrace 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
Rich Slogar [Mon, 13 Apr 2015 18:13:09 +0000 (18:13 +0000)]
Merge "docs: remove adb install option" into lmp-docs
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)
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
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.