OSDN Git Service
David Friedman [Fri, 22 May 2015 22:32:19 +0000 (22:32 +0000)]
am
dd4dc4a0: resolved conflicts for merge of
7044ee16 to mnc-preview-docs
* commit '
dd4dc4a0bec72cbfae8a3b27c72d75e90d38c79b':
Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.
David Friedman [Fri, 22 May 2015 22:23:12 +0000 (15:23 -0700)]
resolved conflicts for merge of
7044ee16 to mnc-preview-docs
Change-Id: Ia0d831660d7744f34c68dba62e19a11c83ec2ee7
Griff Hazen [Fri, 22 May 2015 20:07:11 +0000 (20:07 +0000)]
am
8f585128: (-s ours) am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
8f585128f5ce28219f4f56bef27caac139bbfbd7':
Griff Hazen [Fri, 22 May 2015 20:07:06 +0000 (20:07 +0000)]
am
dc085ed2: (-s ours) am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
dc085ed27a70296d4b4d30ba414b39b6f5a8eb9f':
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:37:49 +0000 (15:37 +0000)]
am
fe6d855c: am
16580c9b: am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
fe6d855cf3239558f780f91ded6679f54cd47661':
frameworks/base/docs: add jd files for NDK reference
Johan Euphrosine [Fri, 22 May 2015 15:27:01 +0000 (15:27 +0000)]
am
16580c9b: am
460bcb54: Merge "frameworks/base/docs: add jd files for NDK reference" into lmp-docs
* commit '
16580c9bb4ef4cad1f5d59402a855189decb56ba':
frameworks/base/docs: add jd files for NDK reference
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
Joe Fernandez [Fri, 22 May 2015 04:29:13 +0000 (04:29 +0000)]
am
ee143ce3: docs: M Preview Program overview, update 2
* commit '
ee143ce3eca3db788ddff6f21a8aae6471eec5db':
docs: M Preview Program overview, update 2
Joe Fernandez [Fri, 22 May 2015 04:08:41 +0000 (21:08 -0700)]
docs: M Preview Program overview, update 2
Change-Id: If36aa779a29b9ac0a5c36e7ecf4bfe80a25d5ba4
Griff Hazen [Thu, 21 May 2015 22:58:25 +0000 (22:58 +0000)]
am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
d4e00d2b9d29e62b1ad989afb1fe2bfe3b519891':
Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
Griff Hazen [Thu, 21 May 2015 22:58:21 +0000 (22:58 +0000)]
am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
5825ad231319207a64debacaa3db4812548b0442':
Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
Griff Hazen [Thu, 21 May 2015 22:55:23 +0000 (22:55 +0000)]
am
d4e00d2b: (-s ours) Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '
d4e00d2b9d29e62b1ad989afb1fe2bfe3b519891':
Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
Griff Hazen [Thu, 21 May 2015 22:55:18 +0000 (22:55 +0000)]
am
5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
* commit '
5825ad231319207a64debacaa3db4812548b0442':
Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
Griff Hazen [Thu, 21 May 2015 22:43:45 +0000 (22:43 +0000)]
Merge "Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
Dirk Dougherty [Thu, 21 May 2015 22:13:19 +0000 (22:13 +0000)]
am
85dea528: Doc change: updated images, landings, and ndk updates.
* commit '
85dea528866217d4b3d40a1162c00c4e836504aa':
Doc change: updated images, landings, and ndk updates.
Dirk Dougherty [Thu, 21 May 2015 21:20:25 +0000 (14:20 -0700)]
Doc change: updated images, landings, and ndk updates.
Change-Id: If128f8394438471365db6f7c0a42e6b38d25d250
Griff Hazen [Thu, 21 May 2015 21:15:12 +0000 (21:15 +0000)]
Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE
This CL didn't ship with diamond-release, but will make diamond-mr1.
This reverts commit
80fa3fa027c06be0f4bbd3a4ab319914377d883d.
Change-Id: I1b037b6ac6a504235463a36a5dcd152b6a1434f3
Griff Hazen [Thu, 21 May 2015 20:48:59 +0000 (20:48 +0000)]
Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE
This CL didn't ship with diamond-release, but will make diamond-mr1.
This reverts commit
c663d99f007c0faa7b66a569ec4083b82d60ef15.
Change-Id: I1430ed7a3221a4f06ad730778c757a68e16b808b
Luan Nguyen [Thu, 21 May 2015 18:26:34 +0000 (18:26 +0000)]
am
5c7dcb30: am
0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples
* commit '
5c7dcb3054bef13896631de04aa45fc77782a1c2':
docs: Update the AlwaysOn sample link to point to DAC's samples
Luan Nguyen [Thu, 21 May 2015 18:12:35 +0000 (18:12 +0000)]
am
0e7fa9e3: docs: Update the AlwaysOn sample link to point to DAC\'s samples
* commit '
0e7fa9e32aecdd3d124828ac459ad6c14776c8e4':
docs: Update the AlwaysOn sample link to point to DAC's samples
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
Joe Fernandez [Thu, 21 May 2015 14:16:39 +0000 (14:16 +0000)]
am
23fcc39e: docs: M Preview downloads and SDK Setup pages v2
* commit '
23fcc39e419c74533697cc9858709e681266830a':
docs: M Preview downloads and SDK Setup pages v2
Luan Nguyen [Thu, 21 May 2015 14:16:34 +0000 (14:16 +0000)]
am
dfa79aeb: am
d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs
* commit '
dfa79aeb6fd119127b790704c30f2d27b464b4a8':
docs: Refresh Wearable support library reference for Diamond
Luan Nguyen [Thu, 21 May 2015 14:16:29 +0000 (14:16 +0000)]
am
6d592518: am
8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
* commit '
6d592518b863e5cbdb6542003377f4e2bf254be2':
docs: Remove references to Android Studio 0.8 beta
Luan Nguyen [Thu, 21 May 2015 14:16:24 +0000 (14:16 +0000)]
am
2801c77e: am
606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs
* commit '
2801c77ef3f76092ae4ef8b1888bc26399ba9188':
docs: Add Always-On lesson for Wear apps
Luan Nguyen [Thu, 21 May 2015 14:16:13 +0000 (14:16 +0000)]
am
94587871: am
5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs
* commit '
94587871d26067a50d4a0a975f6ee6a7eed6f0bd':
docs: Add always-on design for wearable activities
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
Joe Fernandez [Tue, 19 May 2015 19:27:07 +0000 (12:27 -0700)]
docs: M Preview downloads and SDK Setup pages v2
Change-Id: I149061fc41d805722171f037cf62f8c64bffdefe
Filip Gruszczynski [Thu, 21 May 2015 02:55:33 +0000 (02:55 +0000)]
am
037c9cac: Merge "Fix build." into cw-d-mr1-dev
* commit '
037c9caccdc98bfe9d952e797535611c791787aa':
Fix build.
Filip Gruszczynski [Thu, 21 May 2015 02:41:06 +0000 (02:41 +0000)]
Merge "Fix build." into cw-d-mr1-dev
Filip Gruszczynski [Thu, 21 May 2015 02:40:27 +0000 (19:40 -0700)]
Fix build.
Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733
Luan Nguyen [Wed, 20 May 2015 23:09:50 +0000 (23:09 +0000)]
am
d5600855: Merge "docs: Refresh Wearable support library reference for Diamond" into lmp-mr1-ub-docs
* commit '
d560085514ca33e187e8e641ebbb0e6ef1f24041':
docs: Refresh Wearable support library reference for Diamond
Luan Nguyen [Wed, 20 May 2015 23:09:46 +0000 (23:09 +0000)]
am
8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
* commit '
8b959ee95b4dfa191c6924b3c88fad72b700d81c':
docs: Remove references to Android Studio 0.8 beta
Luan Nguyen [Wed, 20 May 2015 23:09:41 +0000 (23:09 +0000)]
am
606e84cf: Merge "docs: Add Always-On lesson for Wear apps" into lmp-mr1-ub-docs
* commit '
606e84cf6353aec066a34517c2c40a0d35e335bc':
docs: Add Always-On lesson for Wear apps
Luan Nguyen [Wed, 20 May 2015 23:09:31 +0000 (23:09 +0000)]
am
5ee30ed5: Merge "docs: Add always-on design for wearable activities" into lmp-mr1-ub-docs
* commit '
5ee30ed5f5d83ec4d462db9ba6039e3c6cbdb7f4':
docs: Add always-on design for wearable activities
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
Filip Gruszczynski [Wed, 20 May 2015 22:54:14 +0000 (22:54 +0000)]
am
cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev
* commit '
cb89ac84c621e047d81873428325dfd747b90a6b':
Support for devices with a chin.
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
Filip Gruszczynski [Wed, 20 May 2015 22:41:42 +0000 (22:41 +0000)]
Merge "Support for devices with a chin." into cw-d-mr1-dev
Cedric Ho [Wed, 20 May 2015 21:56:27 +0000 (21:56 +0000)]
am
80cf2210: Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.
* commit '
80cf2210226bc652181abafe606b69ebce63af78':
Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.
Filip Gruszczynski [Mon, 20 Apr 2015 15:40:57 +0000 (08:40 -0700)]
Support for devices with a chin.
Information about the chin is now part of the config.xml instead of the
theme. It is retrieved by WindowManagerService and passed to the clients
as insets. Clients can adjust their behavior in a way that makes it
invisible to the user, that part of the surface doesn't actually exist.
Bug:
19908853
Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f
Cedric Ho [Tue, 19 May 2015 22:44:31 +0000 (15:44 -0700)]
Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.
Change-Id: Ic40d90f1a7a9942f5e82080668552239bbed9b03
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
Joe Fernandez [Tue, 19 May 2015 22:07:20 +0000 (22:07 +0000)]
am
97c616cb: Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs
* commit '
97c616cb113ba3144ff91b7f974d832fdc5ff0f0':
docs: M Preview - Updating image for Program Overview
Joe Fernandez [Tue, 19 May 2015 21:59:14 +0000 (21:59 +0000)]
Merge "docs: M Preview - Updating image for Program Overview" into mnc-preview-docs
Joe Fernandez [Tue, 19 May 2015 21:57:19 +0000 (14:57 -0700)]
docs: M Preview - Updating image for Program Overview
- also removing unused images
Change-Id: Ic120bc3b119ccda70e85fb0a7254d835677467dd
Yigit Boyar [Tue, 19 May 2015 18:40:36 +0000 (18:40 +0000)]
Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
Joe Fernandez [Tue, 19 May 2015 00:16:51 +0000 (00:16 +0000)]
am
2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs
* commit '
2b18c39dacd6a14a677b13556e3c8bafa8e110d6':
docs: M Preview landing page updates
Rich Slogar [Tue, 19 May 2015 00:16:46 +0000 (00:16 +0000)]
am
3f3cde41: am
a01f2e73: am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
3f3cde41d178267aeff9a41ec56bc95ce1ad45bf':
docs: emulator updates
Joe Fernandez [Tue, 19 May 2015 00:07:58 +0000 (00:07 +0000)]
Merge "docs: M Preview landing page updates" into mnc-preview-docs
Joe Fernandez [Tue, 19 May 2015 00:02:57 +0000 (17:02 -0700)]
docs: M Preview landing page updates
- Simplify the action links
- Remove data binding section: this is too much emphasis on that tool
Change-Id: Ic81cef14985a6cc3f14bc9176dd8311ef265d9da
Rich Slogar [Tue, 19 May 2015 00:05:35 +0000 (00:05 +0000)]
am
a01f2e73: am
c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '
a01f2e737c23ea8a45d34b9709b9a1010385b4c5':
docs: emulator updates
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
Yigit Boyar [Mon, 18 May 2015 23:38:41 +0000 (23:38 +0000)]
Revert "Make VPA.setInterpolator(null) unset the interpolator."
This reverts commit
58ae164100060d1b8a9709aeea7a2b488ff0ac98.
Change-Id: I6d9942b41694f6a5e6c211df839aa385eea0c496
Vladislav Kaznacheev [Mon, 18 May 2015 23:32:55 +0000 (23:32 +0000)]
Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
Dirk Dougherty [Mon, 18 May 2015 18:44:23 +0000 (18:44 +0000)]
am
bd5cf5de: Merge "Doc change: edits and image updates." into mnc-preview-docs
* commit '
bd5cf5de84d802d7858371cf1f06b47c7f7b56cf':
Doc change: edits and image updates.
Dirk Dougherty [Mon, 18 May 2015 18:33:16 +0000 (18:33 +0000)]
Merge "Doc change: edits and image updates." into mnc-preview-docs
Dirk Dougherty [Mon, 18 May 2015 18:32:09 +0000 (11:32 -0700)]
Doc change: edits and image updates.
Change-Id: Ic09da0c7cab676aa8ad4da9eae22e9c631fc288e
Rich Slogar [Mon, 18 May 2015 17:39:00 +0000 (17:39 +0000)]
am
348d105e: am
4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '
348d105e3590b167330356d2ae98d341d98cb18e':
docs: build-cmd-line-updates
Rich Slogar [Mon, 18 May 2015 17:24:50 +0000 (17:24 +0000)]
am
4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '
4e793fba568950ee2b3758e1482006661430440e':
docs: build-cmd-line-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
Dirk Dougherty [Mon, 18 May 2015 03:48:35 +0000 (03:48 +0000)]
am
74709453: Doc change: adjust distribute and preview card grids and styles.
* commit '
747094539612e565f512e42ca9a750cb316ed573':
Doc change: adjust distribute and preview card grids and styles.
Dirk Dougherty [Fri, 15 May 2015 07:51:24 +0000 (00:51 -0700)]
Doc change: adjust distribute and preview card grids and styles.
Change-Id: I0b0fd5688c5efdb881d677173afdfb5f63d2fa73
Joe Fernandez [Fri, 15 May 2015 22:59:03 +0000 (22:59 +0000)]
am
a06ac3a0: docs: M Preview Content Sync #1
* commit '
a06ac3a0d8f5e9da99107803586533503a11f60a':
docs: M Preview Content Sync #1
Luan Nguyen [Fri, 15 May 2015 22:47:47 +0000 (22:47 +0000)]
am
e14ffac6: am
193841be: Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs
* commit '
e14ffac62eca9656fc552a2e4d914eaecba86b7f':
docs: Add tag heuer logo to wear landing page
Joe Fernandez [Fri, 15 May 2015 22:42:17 +0000 (15:42 -0700)]
docs: M Preview Content Sync #1
This change list is a snapshot of work in progress on other change
lists. If you have conflicts with this change, you should prefer your
own changes over what is contained in this change.
Change-Id: Ied44713d5078c938fab10d29a3b6e720559144b4
Luan Nguyen [Fri, 15 May 2015 22:34:58 +0000 (22:34 +0000)]
am
193841be: Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs
* commit '
193841bebf6be4efa4e0c3a0e5e4a44ceef24f6e':
docs: Add tag heuer logo to wear landing page
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 [Fri, 15 May 2015 20:24:58 +0000 (20:24 +0000)]
am
6b4c3fed: docs: Refactor Google Services pages for site redesign
* commit '
6b4c3fed885db4341076159dc549d6bdae4df02e':
docs: Refactor Google Services pages for site redesign
Joe Fernandez [Fri, 15 May 2015 02:43:49 +0000 (19:43 -0700)]
docs: Refactor Google Services pages for site redesign
b/
18225342 - removed outdated advertising ux recommendations
Redirects Change-Id: I669b2c7f216be28603594ae3f2909f50e7eaf60d
Change-Id: I50eada1885156c2abfcc0b1c2bd1f61bfc790e72
Vladislav Kaznacheev [Fri, 15 May 2015 20:01:32 +0000 (13:01 -0700)]
Make VPA.setInterpolator(null) unset the interpolator.
Bug:
21199392
Change-Id: Iae4b82254ddf6b60d442258e79ff0ea4d54c0a4d
Dirk Dougherty [Fri, 15 May 2015 03:22:53 +0000 (03:22 +0000)]
am
efd254b2: Doc change: fix urls, remove obsolete image.
* commit '
efd254b2f9246d4c259be7885ef344be745bc8bc':
Doc change: fix urls, remove obsolete image.
Dirk Dougherty [Fri, 15 May 2015 03:17:37 +0000 (03:17 +0000)]
am
de401c82: Doc change: More changes to distribute files, Google Services page update.
* commit '
de401c82f58a9465593391fede942fe6ffd22ef1':
Doc change: More changes to distribute files, Google Services page update.
Dirk Dougherty [Fri, 15 May 2015 03:14:34 +0000 (20:14 -0700)]
Doc change: fix urls, remove obsolete image.
Change-Id: I61ec972b1df2c3211da6e21ee4e4ec3319d0d02b
Dirk Dougherty [Sat, 9 May 2015 19:10:56 +0000 (12:10 -0700)]
Doc change: More changes to distribute files, Google Services page update.
Change-Id: I047ff9165c5844075561b31e42f8127d8819aeb0
Joe LaPenna [Thu, 14 May 2015 21:07:54 +0000 (21:07 +0000)]
am
627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
* commit '
627f26817f752e0e1beb4185e778edc4501b4aa6':
Wait for KEY_SLEEP UP event before calling goToSleep()
Joe LaPenna [Thu, 14 May 2015 20:55:08 +0000 (20:55 +0000)]
Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
Joe Fernandez [Thu, 14 May 2015 15:53:44 +0000 (15:53 +0000)]
am
a0f0b5bf: am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
a0f0b5bfd8df9e0caa6848bc479f1ed3dc492efc':
docs: Add weekly subscriptions and grace period information to IAB docs
Joe Fernandez [Thu, 14 May 2015 15:40:38 +0000 (15:40 +0000)]
am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
574690b13c8f0d4835c6d86b8e26fc4c9b914037':
docs: Add weekly subscriptions and grace period information to IAB 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
John Reck [Thu, 14 May 2015 14:38:07 +0000 (07:38 -0700)]
DO NOT MERGE resolved conflicts for merge of
951f2347 to lmp-mr1-ub-dev
Change-Id: Ic392bf6f2cf9e9bf526b6ea63a3be7e50420e7d1
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
John Reck [Thu, 14 May 2015 01:05:47 +0000 (01:05 +0000)]
am
d955dceb: am
862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
* commit '
d955dceb4f38f214e62024e808b2b1a21be41940':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
John Reck [Thu, 14 May 2015 00:51:07 +0000 (00:51 +0000)]
am
862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
* commit '
862540cdb11a7128ae1fd670136f398645b4af7b':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
John Reck [Thu, 14 May 2015 00:40:44 +0000 (00:40 +0000)]
Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
Rich Slogar [Wed, 13 May 2015 23:56:20 +0000 (16:56 -0700)]
docs: build-cmd-line-updates
b/
20944423
Change-Id: I0c384650664c51b5b7879bb58deca2be8f1ceff9
John Reck [Thu, 14 May 2015 00:16:31 +0000 (17:16 -0700)]
resolved conflicts for merge of
e869835d to lmp-mr1-ub-dev
Change-Id: Ia183cafb1aa19dcbb6e3bbefceecec5df29663da
David Friedman [Wed, 13 May 2015 23:46:36 +0000 (23:46 +0000)]
am
7fc3b6c0: am
abd8d422: am
f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs
* commit '
7fc3b6c00b55e15881d1f098666399b674a64e42':
Docs: NDK r10e changes to publish to DAC.
David Friedman [Wed, 13 May 2015 23:30:41 +0000 (23:30 +0000)]
am
abd8d422: am
f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs
* commit '
abd8d42225f58396abaef2cf0e8a604be111e683':
Docs: NDK r10e changes to publish to DAC.
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
OSDN Git Service
