OSDN Git Service
Eric Gilmore [Mon, 3 Nov 2014 20:53:40 +0000 (20:53 +0000)]
Merge commit \'
a4eb81b\' into klp-modular-dev-plus-aosp
automerge:
068cb36
* commit '
068cb36877144dc337766c1113250f5ebc2cbf6f':
Joe Fernandez [Mon, 3 Nov 2014 20:50:40 +0000 (20:50 +0000)]
am
a63f81ec: am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
automerge:
a9d803e
* commit '
a9d803e0f7efe4c899ea37a50653452edb6d77fd':
Fred Fettinger [Mon, 3 Nov 2014 20:47:38 +0000 (20:47 +0000)]
am
b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
automerge:
7565da1 -s ours
* commit '
7565da1f38f9bd1aad1749aa829b54fe2df223b6':
smain@google.com [Mon, 3 Nov 2014 20:46:33 +0000 (20:46 +0000)]
am
63cd4977: am
770c3c5e: fix unclickable link due to overlay from offset dev below
automerge:
3f0cf02
* commit '
3f0cf028aef394d91610344850cfc3c2e76b4ebb':
Quddus Chong [Mon, 3 Nov 2014 20:42:23 +0000 (20:42 +0000)]
am
9df3d67b: am
7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
automerge:
581d03b
* commit '
581d03b1d539ebd3180dee5680d712f74011a3e4':
Deepanshu Gupta [Mon, 3 Nov 2014 20:40:55 +0000 (20:40 +0000)]
am
4f133894: Exclude KXmlParser from LayoutLib.
automerge:
adb14af
* commit '
adb14afbfb4c37cfc684537d85123b36539fffed':
Joe Fernandez [Mon, 3 Nov 2014 20:37:46 +0000 (20:37 +0000)]
am
59c04ece: am
bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
automerge:
37ec657
* commit '
37ec65701121374b0edf3cfc454463c90666399d':
Deepanshu Gupta [Mon, 3 Nov 2014 20:34:42 +0000 (20:34 +0000)]
am
11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE]
automerge:
fcaf3e9 -s ours
* commit '
fcaf3e9bd031e1ad4c38eee1b81064cca75e26b4':
Rich Slogar [Mon, 3 Nov 2014 20:33:08 +0000 (20:33 +0000)]
am
916a6ea3: am
6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs
automerge:
9779c90
* commit '
9779c905eac26ab6ce7ce775587c75f1de081dd4':
Quddus Chong [Mon, 3 Nov 2014 20:31:51 +0000 (20:31 +0000)]
am
bb5a1848: am
8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
automerge:
dfb86b9
* commit '
dfb86b994ff7d51ba1a1683c7123195cc9930c95':
Quddus Chong [Mon, 3 Nov 2014 20:30:45 +0000 (20:30 +0000)]
am
bf29d697: am
6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
automerge:
9566bd2
* commit '
9566bd23390b0f21582a59673ded22f47b50ffe0':
Ricardo Cervera [Mon, 3 Nov 2014 20:29:24 +0000 (20:29 +0000)]
am
a18075e8: am
bd964cad: docs: Removing references to self note on Common Intents page.
automerge:
5f9d680
* commit '
5f9d680dd73b437e1e311f11f255b659ad18135b':
Ricardo Cervera [Mon, 3 Nov 2014 20:28:06 +0000 (20:28 +0000)]
am
6d30f576: am
3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
automerge:
a6abe30
* commit '
a6abe30397cf1f67b871a3db7555aa7f0f9841d9':
Quddus Chong [Mon, 3 Nov 2014 20:23:39 +0000 (20:23 +0000)]
am
4be6fdeb: am
ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
automerge:
ddb8c4e
* commit '
ddb8c4ee47e663ca984ff0291fae2cab2c5bc173':
Ricardo Cervera [Mon, 3 Nov 2014 20:22:28 +0000 (20:22 +0000)]
am
0e61e44d: am
2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
automerge:
2166913
* commit '
2166913933661f4f85fd649ad55997d59a5e3d31':
Rich Slogar [Mon, 3 Nov 2014 20:21:20 +0000 (20:21 +0000)]
am
64460a2b: am
83d5c9bf: docs:change required ADT version to 23.0.2
automerge:
f07d984
* commit '
f07d984fed70be0718e7e9019bc933f58fbeca46':
smain@google.com [Mon, 3 Nov 2014 20:20:13 +0000 (20:20 +0000)]
am
8267ffcc: am
cef9aab6: Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
automerge:
90ab19b
* commit '
90ab19bb8dec2e444e274ab4c8990545b481ca7b':
Joe Fernandez [Mon, 3 Nov 2014 19:41:56 +0000 (19:41 +0000)]
am
eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
* commit '
eff5efac2170e05b2a5e197788bf455edee57cce':
docs: Update Android Dashboard for November 2014
Joe Fernandez [Mon, 3 Nov 2014 19:37:19 +0000 (19:37 +0000)]
Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
Joe Fernandez [Thu, 30 Oct 2014 17:57:31 +0000 (10:57 -0700)]
docs: Update Android Dashboard for November 2014
Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39
Ricardo Cervera [Mon, 3 Nov 2014 17:31:32 +0000 (17:31 +0000)]
am
3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
* commit '
3e621914cacf692700dce007ec7d7893fcc12a8c':
docs: Add links to Wear UI training from Design pages.
Ricardo Cervera [Mon, 3 Nov 2014 17:27:08 +0000 (17:27 +0000)]
Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
Scott Rowe [Mon, 3 Nov 2014 16:54:29 +0000 (16:54 +0000)]
am
cd796536: Merge "docs: b/
18119632 isGame, b/
18119595 banner" into lmp-docs
* commit '
cd796536ce81fe6f8a63c3867b57e7b7f92a8542':
docs: b/
18119632 isGame, b/
18119595 banner
Scott Rowe [Mon, 3 Nov 2014 16:24:36 +0000 (16:24 +0000)]
Merge "docs: b/
18119632 isGame, b/
18119595 banner" into lmp-docs
Scott Rowe [Sat, 1 Nov 2014 16:28:23 +0000 (16:28 +0000)]
am
aa275bf9: Merge "docs: b/
15180738 - invalid urls in badge generator" into lmp-docs
* commit '
aa275bf989f0bf9e968f0804bb57ec7b1a7c1f54':
docs: b/
15180738 - invalid urls in badge generator
Scott Rowe [Sat, 1 Nov 2014 16:23:10 +0000 (16:23 +0000)]
Merge "docs: b/
15180738 - invalid urls in badge generator" into lmp-docs
Joe Fernandez [Sat, 1 Nov 2014 01:14:15 +0000 (01:14 +0000)]
am
e8ad737d: docs: multidex - building apps with over 65K method references
* commit '
e8ad737db6b35bfe342dc0a1674f1200d08e45f5':
docs: multidex - building apps with over 65K method references
Joe Fernandez [Fri, 31 Oct 2014 06:59:28 +0000 (23:59 -0700)]
docs: multidex - building apps with over 65K method references
Change-Id: I822cdc54d0f2df34a89d5294ff7ea1f5f83b25f9
Scott Rowe [Fri, 31 Oct 2014 20:59:45 +0000 (13:59 -0700)]
docs: b/
15180738 - invalid urls in badge generator
Change-Id: Ifb7ab1ad1b860c7fb7faec624b7d3ad4244fee36
Joe Fernandez [Fri, 31 Oct 2014 19:28:30 +0000 (19:28 +0000)]
am
ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs
* commit '
ea17fdecae470beeae8e12666254bf8f6446b06e':
docs:studio-updates-814v2
Joe Fernandez [Fri, 31 Oct 2014 19:23:45 +0000 (19:23 +0000)]
Merge "docs:studio-updates-814v2" into lmp-docs
Rich Slogar [Fri, 31 Oct 2014 18:03:26 +0000 (11:03 -0700)]
docs:studio-updates-814v2
Change-Id: I68f6fb1e40e5b7bbdf25e6ab1340d02116452a02
smain@google.com [Fri, 31 Oct 2014 17:58:09 +0000 (17:58 +0000)]
am
26bf2f7b: revise helpouts tags to use just one on each page
* commit '
26bf2f7b8730d9b4b1459d229207fe55597b000d':
revise helpouts tags to use just one on each page
smain@google.com [Fri, 31 Oct 2014 17:45:23 +0000 (10:45 -0700)]
revise helpouts tags to use just one on each page
Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
smain@google.com [Fri, 31 Oct 2014 17:45:23 +0000 (10:45 -0700)]
revise helpouts tags to use just one on each page
Change-Id: I67e9448567a60dec4b140837d58e46aeccf586a5
Scott Rowe [Wed, 29 Oct 2014 20:32:30 +0000 (13:32 -0700)]
docs: b/
18119632 isGame, b/
18119595 banner
Change-Id: I171b4aff3359ec96b2ea1003870739ad586971c7
Alex Klyubin [Fri, 31 Oct 2014 15:44:35 +0000 (15:44 +0000)]
am
dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
* commit '
dd8accfe0f3d71a4e6402595fea48bf435a09b65':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
Alex Klyubin [Fri, 31 Oct 2014 15:36:44 +0000 (15:36 +0000)]
Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
Ricardo Cervera [Fri, 31 Oct 2014 15:16:04 +0000 (15:16 +0000)]
Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev
Joe Fernandez [Fri, 31 Oct 2014 05:21:22 +0000 (05:21 +0000)]
am
81fcc85c: Merge "docs:studio-update-814" into lmp-docs
* commit '
81fcc85c23eea3905238f3f8d359df0344c37865':
docs:studio-update-814
Joe Fernandez [Fri, 31 Oct 2014 05:18:42 +0000 (05:18 +0000)]
Merge "docs:studio-update-814" into lmp-docs
Mark Renouf [Fri, 31 Oct 2014 03:13:21 +0000 (03:13 +0000)]
am
cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE
* commit '
cf0f740e39f79da3fc8367c61ed473273248e8c1':
If no display settings are matched, return the first one. DO NOT MERGE
Mark Renouf [Thu, 30 Oct 2014 20:57:30 +0000 (16:57 -0400)]
If no display settings are matched, return the first one. DO NOT MERGE
Language changes will prevent previously saved display settings from
being loaded. This provides a fallback in the event a single entry exists
but does not match the current (localized) name of the Built-In Display.
BUG:
18130296
BUG:
18190800
Change-Id: Ibeff56045fc5713b9f79707dfb92bafc9fadd84f
Rich Slogar [Wed, 29 Oct 2014 21:54:24 +0000 (14:54 -0700)]
docs:studio-update-814
Change-Id: Ie20289d8ddeb9bace07f05fa79e89e9b850fa0b1
Scott Rowe [Thu, 30 Oct 2014 23:06:18 +0000 (23:06 +0000)]
am
397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs
* commit '
397eb67fbf9af409406750ce58a16b64b4a6b1e2':
docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
Scott Rowe [Thu, 30 Oct 2014 22:55:19 +0000 (22:55 +0000)]
Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs
Mark Renouf [Thu, 30 Oct 2014 22:33:32 +0000 (22:33 +0000)]
am
7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
* commit '
7be03da0d4365346934c9d6672526119765d1047':
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
Mark Renouf [Thu, 30 Oct 2014 22:27:03 +0000 (22:27 +0000)]
Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
Alex Klyubin [Thu, 30 Oct 2014 20:33:58 +0000 (13:33 -0700)]
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
Bug:
18144779
Change-Id: I50e1bb18456295170ef288ad089a0edad7f00ecf
Mark Renouf [Thu, 30 Oct 2014 20:40:27 +0000 (16:40 -0400)]
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
BUG:
18130296
Change-Id: Iaee21a45e8e84c6bf8d99b04382e43ec12606ce6
David Friedman [Thu, 30 Oct 2014 19:56:37 +0000 (19:56 +0000)]
am
e91c37de: Fixes wrongly nested braces. Bug:
17499985
* commit '
e91c37de784babbe879c78c83817b99d54b61d2f':
Fixes wrongly nested braces. Bug:
17499985
David Friedman [Thu, 30 Oct 2014 18:55:53 +0000 (11:55 -0700)]
Fixes wrongly nested braces.
Bug:
17499985
Change-Id: I6dc7abb14c06462a3eb9be3cb15d8baf11115323
Ricardo Cervera [Thu, 30 Oct 2014 15:34:37 +0000 (15:34 +0000)]
am
e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs
* commit '
e3dd89a42a48c9ba461a0fff7859b7d0b205d146':
docs: Two-page notification fix.
Ricardo Cervera [Thu, 30 Oct 2014 15:27:31 +0000 (15:27 +0000)]
Merge "docs: Two-page notification fix." into lmp-docs
kmccormick [Wed, 29 Oct 2014 23:20:34 +0000 (23:20 +0000)]
am
13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
* commit '
13d7ea464ec7947a0c55cd778c8b2bacc9d0745d':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:12:52 +0000 (23:12 +0000)]
am
3e92c4a2: am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
* commit '
3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Wed, 29 Oct 2014 23:09:23 +0000 (23:09 +0000)]
am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
* commit '
1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
Doc update: deliv receipt, rate exceeded, bug fixes.
kmccormick [Tue, 14 Oct 2014 22:34:21 +0000 (15:34 -0700)]
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
Cherry-pick from: Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
Fix for:
b/
17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
kmccormick [Wed, 29 Oct 2014 23:04:28 +0000 (23:04 +0000)]
Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
kmccormick [Tue, 14 Oct 2014 22:34:21 +0000 (15:34 -0700)]
Doc update: deliv receipt, rate exceeded, bug fixes.
Fix for:
b/
17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
Ricardo Cervera [Wed, 29 Oct 2014 21:27:22 +0000 (14:27 -0700)]
docs: Two-page notification fix.
Bug:
18108228
Change-Id: I96863766dc3b787af92e8bf71615eee56afbbca9
David Friedman [Wed, 29 Oct 2014 18:15:31 +0000 (18:15 +0000)]
am
0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
* commit '
0fa6edced7496b898d31ff7dab7255a1e0dffa9b':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
Deepanshu Gupta [Wed, 29 Oct 2014 01:47:28 +0000 (18:47 -0700)]
Add missing delegate for AnimatorInflater.
Change-Id: I96ef2b1085dadfae280df6740aebc10f57e3b949
Deepanshu Gupta [Wed, 29 Oct 2014 00:13:53 +0000 (00:13 +0000)]
Merge "Skip loading animations." into lmp-dev
Deepanshu Gupta [Wed, 29 Oct 2014 00:07:56 +0000 (00:07 +0000)]
Merge "Fix multiple styles case in resource resolution." into lmp-dev
Deepanshu Gupta [Wed, 29 Oct 2014 00:07:40 +0000 (00:07 +0000)]
Merge "Use right theme for drawable inflation." into lmp-dev
David Friedman [Tue, 28 Oct 2014 01:19:55 +0000 (18:19 -0700)]
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
Change-Id: I7be014d27ef85631b5e26ad2b3ab81d3a12d1813
Deepanshu Gupta [Tue, 28 Oct 2014 22:07:25 +0000 (15:07 -0700)]
Skip loading animations.
This is a temporary fix until Path.approximate() is supported.
Bug: http://b.android.com/77865
Change-Id: I28739e58f51fabaaf1dcc1c9be61cd0b17e84eec
Joe Fernandez [Tue, 28 Oct 2014 18:15:33 +0000 (18:15 +0000)]
am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
* commit '
40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 18:15:28 +0000 (18:15 +0000)]
am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '
3c00bc01f9c6e82a0859201f74237998b24872da':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 18:15:24 +0000 (18:15 +0000)]
am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '
d126294a8f954fb758d3f67bc5271014748ba9e7':
Docs: Adding Android Studio instructions for adding IAB service.
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
Deepanshu Gupta [Tue, 28 Oct 2014 18:01:06 +0000 (11:01 -0700)]
Fix multiple styles case in resource resolution.
When multiple styles are applied to a theme, we only remembered the last
one. This change fixes the issue.
Change-Id: I46490e882edc3eabe522a641c83366234b5bb25d
Deepanshu Gupta [Tue, 28 Oct 2014 17:50:00 +0000 (10:50 -0700)]
Use right theme for drawable inflation.
The theme information was lost when inflating drawables. As a result,
drawables inflated in the ActionBar did not have the right tint.
Change-Id: I13d5c78039e35085ed4902289fcb735bb15d972e
Scott Rowe [Fri, 17 Oct 2014 16:55:11 +0000 (09:55 -0700)]
docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
Change-Id: Ic0e1ab185f4c4f4cf85d4bea016ce459d25d8078
Joe Fernandez [Tue, 28 Oct 2014 03:25:39 +0000 (03:25 +0000)]
Merge "docs: Update timing of Android Wear app review" into lmp-docs
Joe Fernandez [Tue, 28 Oct 2014 00:39:53 +0000 (17:39 -0700)]
docs: Update timing of Android Wear app review
Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586
David Friedman [Tue, 28 Oct 2014 02:51:30 +0000 (02:51 +0000)]
Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
David Friedman [Tue, 28 Oct 2014 00:16:44 +0000 (17:16 -0700)]
Updates Notifications screenshot for Android 5.0.
Change-Id: Ib5a3f88ef5d9e580550a18d83568913d6b5d3cef
Eric Gilmore [Tue, 28 Oct 2014 00:15:23 +0000 (17:15 -0700)]
Merge commit '
a4eb81b' into klp-modular-dev-plus-aosp
Conflicts:
docs/html/guide/topics/connectivity/nfc/nfc.jd
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
Eric Gilmore [Fri, 10 Oct 2014 21:24:11 +0000 (14:24 -0700)]
Docs: Adding Android Studio instructions for adding IAB service.
Incorporating some editorial feedback both in and outside the
scope of my small bug fix.
Bug:
17151052
Change-Id: Id3b0c256ca6f7f018fa525eeb1f78979e8f476df
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
Ricardo Cervera [Mon, 20 Oct 2014 22:59:16 +0000 (15:59 -0700)]
docs: Add links to Wear UI training from Design pages.
Bug:
17897252
Bug:
17315120
Change-Id: I58185b76f8197a0124804a296bd32565e4487a33
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
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: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 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 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: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:01:57 +0000 (06:01 +0000)]
Merge "docs: Fix typo in search class" into lmp-dev
OSDN Git Service
