OSDN Git Service
Quddus Chong [Tue, 28 Oct 2014 19:22:15 +0000 (19:22 +0000)]
am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
6face8a04c1aa695a744f12ee2ca0e18cdfb5ed0':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:22:11 +0000 (19:22 +0000)]
am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
f4e32145a214b28522d67e748c0eff74aa915bf6':
docs: Add SearchXonY to Common Intents
Quddus Chong [Tue, 28 Oct 2014 18:15:20 +0000 (18:15 +0000)]
am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 18:15:17 +0000 (18:15 +0000)]
am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
docs: Add SearchXonY to Common Intents
Griff Hazen [Tue, 28 Oct 2014 02:19:22 +0000 (19:19 -0700)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
Jason Monk [Tue, 28 Oct 2014 00:52:56 +0000 (00:52 +0000)]
Add missing passive discovery flag
automerge:
4444c5b
* commit '
4444c5b27874866f18cd8f4abb8914cc17857ea7':
Add missing passive discovery flag
Jason Monk [Mon, 27 Oct 2014 23:20:02 +0000 (19:20 -0400)]
Add missing passive discovery flag
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time. Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.
Bug:
18042409
Bug:
17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
Ying Wang [Mon, 27 Oct 2014 22:35:59 +0000 (22:35 +0000)]
Update current.txt with generics to field types.
automerge:
79775d4
* commit '
79775d4bc4fa71994942dbd1d441aa62827c34be':
Update current.txt with generics to field types.
Quddus Chong [Mon, 27 Oct 2014 01:10:42 +0000 (18:10 -0700)]
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Change-Id: Ic7402251219a84be92d4e58863fd069de6aa4446
Ying Wang [Mon, 20 Oct 2014 20:44:30 +0000 (13:44 -0700)]
Update current.txt with generics to field types.
Bug:
17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
Ricardo Cervera [Fri, 10 Oct 2014 20:37:16 +0000 (13:37 -0700)]
docs: Add SearchXonY to Common Intents
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
Geoff Mendal [Mon, 27 Oct 2014 15:55:18 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 27 Oct 2014 15:53:05 +0000 (08:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4fc460aa64d5ea79e6ac16ce7b700b9a316819d1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 27 Oct 2014 13:33:49 +0000 (06:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6bbba14271ba04f3e4b4836f3e81a22d1c53938f
Auto-generated-cl: translation import
Joe Fernandez [Sat, 25 Oct 2014 09:15:06 +0000 (09:15 +0000)]
am
4fee8c89: docs: Home page - fix card images that are showing up on the home page
* commit '
4fee8c89eb49d4935b4a2725f82d3a08f6a938d3':
docs: Home page - fix card images that are showing up on the home page
Joe Fernandez [Sat, 25 Oct 2014 08:46:20 +0000 (01:46 -0700)]
docs: Home page - fix card images that are showing up on the home page
Change-Id: I943b9b819f91069f961c5f93b14f01499f587e19
Luan Nguyen [Fri, 24 Oct 2014 23:30:37 +0000 (23:30 +0000)]
am
781fe92c: Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev
* commit '
781fe92cfdb96cb8f67d06b4d2500d11a3310550':
docs: Fix metadata description. Add new gesture test. Split layout test.
Luan Nguyen [Fri, 24 Oct 2014 23:17:23 +0000 (23:17 +0000)]
Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev
Luan Nguyen [Fri, 24 Oct 2014 23:04:53 +0000 (23:04 +0000)]
am
bfcc2e1a: am
aec7c974: am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '
bfcc2e1a88e45027d2ba17302cb2fb35fbce3506':
docs: fixed typo/grammar issues.
Joe Fernandez [Fri, 24 Oct 2014 23:04:49 +0000 (23:04 +0000)]
am
abb8ea3d: am
90f734eb: am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
abb8ea3d4be376b0816b791c1afd3cc78300e9d4':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 23:04:46 +0000 (23:04 +0000)]
am
60144a7a: am
bcf9ced4: am
1e5bb861: Link and typo fixed
* commit '
60144a7a06d818e7ef22d08722be67c602aeb088':
Link and typo fixed
Luan Nguyen [Fri, 24 Oct 2014 22:37:25 +0000 (22:37 +0000)]
am
aec7c974: am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '
aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
docs: fixed typo/grammar issues.
Joe Fernandez [Fri, 24 Oct 2014 22:37:16 +0000 (22:37 +0000)]
am
90f734eb: am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
90f734eb180619eb8ffd2e30580f72b500184f8b':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 22:36:54 +0000 (22:36 +0000)]
am
bcf9ced4: am
1e5bb861: Link and typo fixed
* commit '
bcf9ced47a123220271fcca70f71c2adf69ad100':
Link and typo fixed
Luan Nguyen [Fri, 24 Oct 2014 16:02:16 +0000 (09:02 -0700)]
docs: Fix metadata description. Add new gesture test. Split layout test.
Change-Id: I5a8948594af94fa1e7548fc49a0c3946f03d7fc8
Paul Lawrence [Fri, 24 Oct 2014 20:08:33 +0000 (20:08 +0000)]
am
c220d8e5: Stop crypto UI from crashing during encryption
* commit '
c220d8e57ca97c70db1fd72f040bd6c6f70bbf13':
Stop crypto UI from crashing during encryption
Paul Lawrence [Fri, 24 Oct 2014 17:37:40 +0000 (10:37 -0700)]
Stop crypto UI from crashing during encryption
Don't try to read crypto meta data during this time
Bug:
18037893
Change-Id: I3628572b3b90e6fc0a7c71089b447fb0e5303ee9
Luan Nguyen [Fri, 24 Oct 2014 15:59:44 +0000 (15:59 +0000)]
am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '
049db36afd63b972f971f8bac6a405bc2f9437f4':
docs: fixed typo/grammar issues.
Luan Nguyen [Fri, 24 Oct 2014 15:55:47 +0000 (15:55 +0000)]
Merge "docs: fixed typo/grammar issues." into klp-modular-docs
Joe Fernandez [Fri, 24 Oct 2014 09:27:02 +0000 (09:27 +0000)]
am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 08:13:36 +0000 (08:13 +0000)]
am
1e5bb861: Link and typo fixed
* commit '
1e5bb861265072b9af555d09202e49cb38a3c4f1':
Link and typo fixed
Joe Fernandez [Fri, 24 Oct 2014 06:08:43 +0000 (06:08 +0000)]
am
cab73381: Merge "docs: Fix typo in search class" into lmp-dev
* commit '
cab733811554ffcf257ee194a5245521713faf5d':
docs: Fix typo in search class
Joe Fernandez [Fri, 24 Oct 2014 06:08:40 +0000 (06:08 +0000)]
am
553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev
* commit '
553dd209992ffe9bba1160333762c5f3fa6651b0':
docs: Fixed 404 link in SDK Tools page.
Joe Fernandez [Fri, 24 Oct 2014 06:06:00 +0000 (06:06 +0000)]
Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
Joe Fernandez [Fri, 24 Oct 2014 06:02:35 +0000 (06:02 +0000)]
am
3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev
* commit '
3b6d518e79c1045286d2bc368148b44dd1a39bf3':
docs: Fix hprof-conv location in docs.
Joe Fernandez [Fri, 24 Oct 2014 06:02:31 +0000 (06:02 +0000)]
am
4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev
* commit '
4ae8b8f3652ed2382ee5593151ea72b315fb5384':
docs: Fixing misc minor bugs.
Joe Fernandez [Fri, 24 Oct 2014 06:01:57 +0000 (06:01 +0000)]
Merge "docs: Fix typo in search class" into lmp-dev
Joe Fernandez [Fri, 24 Oct 2014 06:00:55 +0000 (06:00 +0000)]
Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev
Joe Fernandez [Fri, 24 Oct 2014 06:00:18 +0000 (06:00 +0000)]
Merge "docs: Fix hprof-conv location in docs." into lmp-dev
Joe Fernandez [Fri, 24 Oct 2014 05:59:03 +0000 (05:59 +0000)]
Merge "docs: Fixing misc minor bugs." into lmp-dev
Hochi Huang [Wed, 22 Oct 2014 14:10:02 +0000 (22:10 +0800)]
[FM]Fix FM App record fail Buganizer ID:
17975676
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
Review: https://partner-android-review.git.corp.google.com/#/c/185235
Change-Id: I024db429b8ff56851c814857691b06ea5e69198a
Luan Nguyen [Thu, 23 Oct 2014 22:51:09 +0000 (22:51 +0000)]
am
578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev
* commit '
578210db199f41dc7c14e53ba925956de835f3c0':
docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
Luan Nguyen [Thu, 23 Oct 2014 22:45:02 +0000 (22:45 +0000)]
Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev
Trevor Johns [Thu, 23 Oct 2014 21:52:47 +0000 (21:52 +0000)]
am
fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev
* commit '
fb28bd158dd387225bb55e31da60101436e7b13c':
Docs: Add TOC page for Wearable samples
Legler Wu [Thu, 23 Oct 2014 03:06:38 +0000 (11:06 +0800)]
[DS] Change the copyright
Change the copyright as Android.
Review: https://partner-android-review.git.corp.google.com/#/c/185241
Change-Id: Id548867805a65c2887ca19cb79d155b5a8c82753
Luan Nguyen [Thu, 23 Oct 2014 17:55:18 +0000 (10:55 -0700)]
docs: Update thumbnail images for resources, update minor text for WR-GS, and
update the title image resolution.
Change-Id: I83e89e3969bd6b837074e86a810cf801be3a6caf
Nancy Chen [Thu, 23 Oct 2014 19:08:19 +0000 (19:08 +0000)]
Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev
Filip Gruszczynski [Thu, 23 Oct 2014 17:56:24 +0000 (10:56 -0700)]
Check if context is actually an activity.
Bug:
18101409
Change-Id: Iab21338ef4ccaab0ce66d664502e0b5e88ad9c50
Trevor Johns [Thu, 23 Oct 2014 16:51:37 +0000 (16:51 +0000)]
Merge "Docs: Add TOC page for Wearable samples" into lmp-dev
Trevor Johns [Thu, 23 Oct 2014 16:11:20 +0000 (09:11 -0700)]
Docs: Add TOC page for Wearable samples
Change-Id: I0fdf412f20fb2a45c34c9700ed1ca9446cfc6ff3
Ricardo Cervera [Thu, 23 Oct 2014 15:43:48 +0000 (15:43 +0000)]
am
8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev
* commit '
8755d9a5361d716433505e883986e8bf5f28d041':
docs: Updating dependency vers nums for support libs.
Ricardo Cervera [Thu, 23 Oct 2014 15:43:44 +0000 (15:43 +0000)]
am
30d0b242: Merge "docs: Support lib dependency fix. Bug:
18029377" into lmp-dev
* commit '
30d0b24280abe4b2c5e1e20819d87f60d34964de':
docs: Support lib dependency fix. Bug:
18029377
Ricardo Cervera [Thu, 23 Oct 2014 15:10:07 +0000 (15:10 +0000)]
Merge "docs: Updating dependency vers nums for support libs." into lmp-dev
Ricardo Cervera [Thu, 23 Oct 2014 15:09:40 +0000 (15:09 +0000)]
Merge "docs: Support lib dependency fix. Bug:
18029377" into lmp-dev
Joe Fernandez [Thu, 23 Oct 2014 07:55:41 +0000 (07:55 +0000)]
am
7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev
* commit '
7c2bfa2eae3d59b0a876e54c4c6b4f21ea997e89':
docs: Add Wear App Quality checklist
Trevor Johns [Thu, 23 Oct 2014 07:55:38 +0000 (07:55 +0000)]
am
fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev
* commit '
fdb02fcf9c8b55252f4375c2f3e8b4872432cbc8':
Docs: Update /samples/new/index.html for Clockwork Beryl release
Joe Fernandez [Thu, 23 Oct 2014 07:55:34 +0000 (07:55 +0000)]
am
16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev
* commit '
16350261e0c491880be42a26bf53965c32e8dd0a':
docs: Add article describing Location API for Android Wear.
Joe Fernandez [Thu, 23 Oct 2014 07:55:31 +0000 (07:55 +0000)]
am
eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev
* commit '
eaee4693814a1c3fbde06474a85570bbf228fc19':
docs:Build tools revisions 21.01 and 21.02
Eric Rowe [Thu, 23 Oct 2014 07:55:27 +0000 (07:55 +0000)]
am
34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev
* commit '
34766d9c3f88e864d37b5c2ece6218e83cd0fe7c':
Add delay in ping connectivity test retry
smain@google.com [Thu, 23 Oct 2014 07:55:23 +0000 (07:55 +0000)]
am
32c820fa: update android workplace screenshot bug:
18038081
* commit '
32c820fac0575b406acef688ce365d9c390fd93e':
update android workplace screenshot bug:
18038081
Ye Wen [Thu, 23 Oct 2014 07:55:19 +0000 (07:55 +0000)]
am
9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev
* commit '
9d28487e05b6f5b2c4d464467f932060de463067':
Disable Content-Disposition header for 53005 and 310120
smain@google.com [Thu, 23 Oct 2014 07:55:15 +0000 (07:55 +0000)]
am
9f987e0a: fix a few of the tags for helpouts compatibility
* commit '
9f987e0ac7a410a38a57a69dad1a721324bce766':
fix a few of the tags for helpouts compatibility
smain@google.com [Thu, 23 Oct 2014 07:55:12 +0000 (07:55 +0000)]
am
54504966: Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev
* commit '
545049665ce3b1cd5a8da44963f849e23aca4412':
some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions.
Joe Fernandez [Thu, 23 Oct 2014 07:03:15 +0000 (07:03 +0000)]
Merge "docs: Add Wear App Quality checklist" into lmp-dev
Luan Nguyen [Tue, 21 Oct 2014 23:24:22 +0000 (16:24 -0700)]
docs: Add Wear App Quality checklist
Change-Id: I81ef6b3283ffb4d924836a84b52bb04acb301649
Trevor Johns [Thu, 23 Oct 2014 06:15:32 +0000 (06:15 +0000)]
Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev
Nancy Chen [Thu, 23 Oct 2014 00:45:26 +0000 (17:45 -0700)]
Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.
Settings and Dialer need label, icon, and color for UI display of
subscriptions/SIMs. Add getters for these methods in SubInfoRecord. Sets
up for the following changes:
+ getIcon will return a drawable instead of a resource ID
+ getColor will return a color value instead of an index
PhoneAccount will also be adding these changes which will be adopted
from SubInfoRecord. Adds changes that were reverted from ag/563976.
Bug:
17971273
Change-Id: Ie2beedf8475c6deb48a6ab83bc9656c1142cc004
Joe Fernandez [Thu, 23 Oct 2014 04:39:23 +0000 (04:39 +0000)]
Merge "docs: Add article describing Location API for Android Wear." into lmp-dev
Luan Nguyen [Mon, 13 Oct 2014 18:59:33 +0000 (11:59 -0700)]
docs: Add article describing Location API for Android Wear.
Change-Id: I1956be7df8cc875270d45652d1b0d414b6395982
Trevor Johns [Thu, 23 Oct 2014 03:53:31 +0000 (20:53 -0700)]
Docs: Update /samples/new/index.html for Clockwork Beryl release
Added SpeedTracker sample to list of new samples.
Change-Id: I88094149ab21b9a24f19bb7693bbce1187b625eb
Joe Fernandez [Thu, 23 Oct 2014 03:14:33 +0000 (03:14 +0000)]
Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev
Eric Rowe [Thu, 23 Oct 2014 01:41:17 +0000 (01:41 +0000)]
Merge "Add delay in ping connectivity test retry" into lmp-dev
Eric Rowe [Thu, 23 Oct 2014 01:34:43 +0000 (18:34 -0700)]
Add delay in ping connectivity test retry
Change-Id: Id6e36f42b2a2d84605185780fb7a3f2144e7a9b9
smain@google.com [Thu, 23 Oct 2014 00:58:50 +0000 (17:58 -0700)]
update android workplace screenshot
bug:
18038081
Change-Id: I6cc59cf002000ee2c938e634ef3662fbba2c70cc
Nancy Chen [Thu, 23 Oct 2014 00:42:23 +0000 (00:42 +0000)]
Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev
Rich Slogar [Wed, 22 Oct 2014 21:10:16 +0000 (14:10 -0700)]
docs:Build tools revisions 21.01 and 21.02
Change-Id: I220f35541e88bf3b5dba1981d7375ecece525e2b
Ye Wen [Thu, 23 Oct 2014 00:23:27 +0000 (00:23 +0000)]
Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev
smain@google.com [Thu, 23 Oct 2014 00:13:51 +0000 (17:13 -0700)]
fix a few of the tags for helpouts compatibility
Change-Id: Ic7f6f281c937bcba8690a50ce1c5417689993352
smain@google.com [Thu, 23 Oct 2014 00:06:09 +0000 (00:06 +0000)]
Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev
smain@google.com [Thu, 23 Oct 2014 00:02:43 +0000 (00:02 +0000)]
am
13eb86a1: Merge "add helpouts widget to first round of pages" into lmp-dev
* commit '
13eb86a11308b2cff7159d287a79fd7cfa2b045b':
add helpouts widget to first round of pages
smain@google.com [Wed, 22 Oct 2014 23:59:14 +0000 (23:59 +0000)]
Merge "add helpouts widget to first round of pages" into lmp-dev
Rich Slogar [Wed, 22 Oct 2014 23:57:53 +0000 (23:57 +0000)]
am
cb79d086: docs:Update 4.4W for Wear GPS suppport
* commit '
cb79d0866695c5a082de02b45d50cf22a9fe8caa':
docs:Update 4.4W for Wear GPS suppport
Ye Wen [Wed, 22 Oct 2014 23:19:05 +0000 (16:19 -0700)]
Disable Content-Disposition header for 53005 and 310120
Platform PDU lib uses a flag in frameworks/base/core resources
instead of mms config in mms service
b/
17634414
Change-Id: I0ba78d6b7d6f2844eafa3dac3691828414975f43
Rich Slogar [Wed, 22 Oct 2014 22:11:55 +0000 (15:11 -0700)]
docs:Update 4.4W for Wear GPS suppport
Change-Id: I1fc5699c84d2c29b26730a949858f9cd6eba4bbe
Craig Mautner [Wed, 22 Oct 2014 20:38:04 +0000 (20:38 +0000)]
Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev
Bryce Lee [Wed, 22 Oct 2014 20:33:07 +0000 (20:33 +0000)]
Merge "[Theater Mode] framework implementation through global setting" into lmp-sprout-dev
Nancy Chen [Wed, 22 Oct 2014 01:36:39 +0000 (18:36 -0700)]
Add an option to set the selected phone account as the default. (1/3)
Modify the phoneAccountSelected method to support the option to set the
selected phone account as the default for outgoing phone calls.
Bug:
18078232
Change-Id: I2689bc9611366d521dfd3dc2086fd31eb6393876
Craig Mautner [Wed, 22 Oct 2014 20:21:22 +0000 (13:21 -0700)]
Cherry pick task movement changes from aosp
The following cherry picks from aosp contain code that keep windows
tracking the task movement.
https://android-review.googlesource.com/#/c/111380/
https://android-review.googlesource.com/#/c/109930
Maybe fixes bug
15729183.
Change-Id: Ida69fe365b06025d119e32b22a8d04958cdbabf3
xin He [Wed, 22 Oct 2014 17:22:51 +0000 (17:22 +0000)]
am
5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev
* commit '
5085c4c2933219831bde11a482c8b2934e4a259f':
Show ProgressDialog when waiting for radio to turn on when provisioning.
xin He [Wed, 22 Oct 2014 17:19:24 +0000 (17:19 +0000)]
Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev
Ricardo Cervera [Wed, 22 Oct 2014 17:06:56 +0000 (17:06 +0000)]
am
0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev
* commit '
0ae6e37e64144dc180c164cfe42fa8faf59f0d53':
docs: Removing extra semicolons in Wear notif examples.
Ricardo Cervera [Wed, 22 Oct 2014 17:03:43 +0000 (17:03 +0000)]
Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev
Quddus Chong [Wed, 22 Oct 2014 17:01:51 +0000 (17:01 +0000)]
am
b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
* commit '
b8796e441ce8b4f2e2f75df9689637f6e18f18db':
docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
smain@google.com [Mon, 20 Oct 2014 21:29:22 +0000 (14:29 -0700)]
add helpouts widget to first round of pages
Change-Id: I2afafb2bf682c5d514eb1adde27bf0277e709198
Quddus Chong [Wed, 22 Oct 2014 01:22:38 +0000 (18:22 -0700)]
docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
Change-Id: Ib152d6577d2369b71aa52e6013a2ff1fbcab0c6e
John Reck [Wed, 22 Oct 2014 16:25:49 +0000 (16:25 +0000)]
Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 22 Oct 2014 15:53:01 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 22 Oct 2014 15:46:41 +0000 (08:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I478370f6105138f39c9dad5079b7c434fa8078b3
Auto-generated-cl: translation import
John Reck [Tue, 21 Oct 2014 17:09:36 +0000 (10:09 -0700)]
Surface:lockHardwareCanvas DO NOT MERGE
Bug:
17440886
Cherry pick of
bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2
Change-Id: I78f25cdcfc49cc6a142a51b8aab009c37be8e6de
Geoff Mendal [Wed, 22 Oct 2014 13:37:04 +0000 (06:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifca413c79959bf4b6585f0fb9b7a5ed1acf1ec9f
Auto-generated-cl: translation import
OSDN Git Service
