OSDN Git Service
Rich Slogar [Mon, 3 Nov 2014 21:01:59 +0000 (21:01 +0000)]
am
4f8a41cc: am
a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge:
858cfad automerge:
d84910b
* commit '
4f8a41cccdd7d7c8070d925decf4893b397cb7bc':
Eric Gilmore [Mon, 3 Nov 2014 21:01:54 +0000 (21:01 +0000)]
am
7ecb0a3e: Merge commit \'
a4eb81b\' into klp-modular-dev-plus-aosp automerge:
068cb36
* commit '
7ecb0a3e5c50837d1b9ea6d952805a9b3795448e':
Joe Fernandez [Mon, 3 Nov 2014 20:57:20 +0000 (20:57 +0000)]
am
7d35425b: am
a63f81ec: am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge:
a9d803e
* commit '
7d35425b98d7228f1b6fc58e96a2b3b9333318c2':
Fred Fettinger [Mon, 3 Nov 2014 20:57:15 +0000 (20:57 +0000)]
am
b33ca4f3: am
b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge:
7565da1 -s ours
* commit '
b33ca4f38c6b2a804fda7dad4cb488134b485130':
Rich Slogar [Mon, 3 Nov 2014 20:54:50 +0000 (20:54 +0000)]
am
a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge:
858cfad
automerge:
d84910b
* commit '
d84910b06b8d8af7de04f975e58a77e65f888374':
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':
smain@google.com [Mon, 3 Nov 2014 20:52:11 +0000 (20:52 +0000)]
am
a77da17e: am
63cd4977: am
770c3c5e: fix unclickable link due to overlay from offset dev below automerge:
3f0cf02
* commit '
a77da17ecc64f6125c954892c6d2dabf1a317be5':
Quddus Chong [Mon, 3 Nov 2014 20:52:07 +0000 (20:52 +0000)]
am
68f8326e: am
9df3d67b: am
7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. automerge:
581d03b
* commit '
68f8326eb4c7e7b56130979dc366c0aba32aa9f8':
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':
Deepanshu Gupta [Mon, 3 Nov 2014 20:47:37 +0000 (20:47 +0000)]
am
ac875484: am
4f133894: Exclude KXmlParser from LayoutLib. automerge:
adb14af
* commit '
ac875484041183a299a36534cbb5a5574f4f93e1':
Joe Fernandez [Mon, 3 Nov 2014 20:47:33 +0000 (20:47 +0000)]
am
9e22cd6f: am
59c04ece: am
bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge:
37ec657
* commit '
9e22cd6fd10983cdd4a84e5a2143cb8ed49e084d':
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':
Deepanshu Gupta [Mon, 3 Nov 2014 20:42:54 +0000 (20:42 +0000)]
am
ec276ed1: am
11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge:
fcaf3e9 -s ours
* commit '
ec276ed12645cc1c735babab1dc7d272fc96a292':
Rich Slogar [Mon, 3 Nov 2014 20:42:50 +0000 (20:42 +0000)]
am
6ae208d4: am
916a6ea3: am
6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs automerge:
9779c90
* commit '
6ae208d455fd2dba80ad9d7cf181ccdeac8c0bb7':
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':
Quddus Chong [Mon, 3 Nov 2014 20:36:18 +0000 (20:36 +0000)]
am
03f627c4: am
bb5a1848: am
8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs automerge:
dfb86b9
* commit '
03f627c4b469d4a85bb3b747ef49d0a20b853f08':
Quddus Chong [Mon, 3 Nov 2014 20:36:14 +0000 (20:36 +0000)]
am
bea6b4d1: am
bf29d697: am
6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs automerge:
9566bd2
* commit '
bea6b4d12106e2a918274ffccd6e370f48654979':
Ricardo Cervera [Mon, 3 Nov 2014 20:36:09 +0000 (20:36 +0000)]
am
e5eaf36c: am
a18075e8: am
bd964cad: docs: Removing references to self note on Common Intents page. automerge:
5f9d680
* commit '
e5eaf36c01e2b3e4d5072b2fa478bc9cc7336e51':
Ricardo Cervera [Mon, 3 Nov 2014 20:36:05 +0000 (20:36 +0000)]
am
d6007644: am
6d30f576: am
3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs automerge:
a6abe30
* commit '
d6007644353347f49090337b3683dcca7092ed3d':
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':
Quddus Chong [Mon, 3 Nov 2014 20:30:09 +0000 (20:30 +0000)]
am
c9c18671: 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 '
c9c186711d88d4869e4cbd53f83bc12806b6ffb5':
Ricardo Cervera [Mon, 3 Nov 2014 20:30:05 +0000 (20:30 +0000)]
am
d89021d7: am
0e61e44d: am
2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs automerge:
2166913
* commit '
d89021d7aaac209a354e02e72fac5c063e8f92fd':
Rich Slogar [Mon, 3 Nov 2014 20:29:55 +0000 (20:29 +0000)]
am
a34b1f15: am
64460a2b: am
83d5c9bf: docs:change required ADT version to 23.0.2 automerge:
f07d984
* commit '
a34b1f15292d219b6e2c13fd6f685735c8dd8f8c':
smain@google.com [Mon, 3 Nov 2014 20:29:51 +0000 (20:29 +0000)]
am
c64c937a: am
8267ffcc: am
cef9aab6: Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs automerge:
90ab19b
* commit '
c64c937a18be1205170ad95b7f601a6e0192b9b9':
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:51:42 +0000 (19:51 +0000)]
am
4f8399c7: am
eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
* commit '
4f8399c7ad4f7e14e3846494c9aa2b88bfd343d9':
docs: Update Android Dashboard for November 2014
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
Geoff Mendal [Mon, 3 Nov 2014 17:53:11 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Ricardo Cervera [Mon, 3 Nov 2014 17:36:56 +0000 (17:36 +0000)]
am
fa37321f: am
3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
* commit '
fa37321f05ad96a1de6863bc08fe1e496cceea9e':
docs: Add links to Wear UI training from Design pages.
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
Geoff Mendal [Mon, 3 Nov 2014 17:10:40 +0000 (09:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia68d4e853864dd44c7531374c30794d4a0bbd8a3
Auto-generated-cl: translation import
Scott Rowe [Mon, 3 Nov 2014 17:00:31 +0000 (17:00 +0000)]
am
1b2cf3f8: am
cd796536: Merge "docs: b/
18119632 isGame, b/
18119595 banner" into lmp-docs
* commit '
1b2cf3f8f64013441fc021db45e00381d4b2d19b':
docs: b/
18119632 isGame, b/
18119595 banner
Casey Burkhardt [Mon, 3 Nov 2014 16:55:27 +0000 (16:55 +0000)]
Merge "Disable circular display mask with color inversion" into lmp-sprout-dev
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
Geoff Mendal [Mon, 3 Nov 2014 14:58:11 +0000 (06:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic1ed8ade48ee37210f335564cc5640675db47290
Auto-generated-cl: translation import
Scott Rowe [Sat, 1 Nov 2014 16:33:50 +0000 (16:33 +0000)]
am
de740985: am
aa275bf9: Merge "docs: b/
15180738 - invalid urls in badge generator" into lmp-docs
* commit '
de7409859315de19f081325a82a9c3ef99f28f26':
docs: b/
15180738 - invalid urls in badge generator
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
Jeff Brown [Fri, 31 Oct 2014 21:45:50 +0000 (14:45 -0700)]
Implement multi-press behavior for power key.
Added support for brightness boost or setting theater
mode from the power key. This behavior is disabled by default and
must be enabled for specific products in a config.xml overlay.
Because the power key is already so overloaded, refactored the
code to split out handling of the similar ENDCALL button and
renamed all of the state that has to do with screenshot chord
detection to avoid confusion.
Bug:
17949215
Change-Id: Id282133188e3781472aabb64fabcee7b98d0c77d
Jeff Brown [Tue, 28 Oct 2014 20:48:55 +0000 (13:48 -0700)]
Add a function to boost screen brightness temporarily.
When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds. This action is
also considered to be user activity.
Bug:
17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
Joe Fernandez [Sat, 1 Nov 2014 01:25:26 +0000 (01:25 +0000)]
am
20207a83: am
e8ad737d: docs: multidex - building apps with over 65K method references
* commit '
20207a83c989fde1d57b45a4c1373ca25fd49bd7':
docs: multidex - building apps with over 65K method references
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:35:52 +0000 (19:35 +0000)]
am
89e73a1c: am
ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs
* commit '
89e73a1c85c3af19530cd7b9f7093668abba9edb':
docs:studio-updates-814v2
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 18:03:56 +0000 (18:03 +0000)]
am
307bcbe3: am
26bf2f7b: revise helpouts tags to use just one on each page
* commit '
307bcbe31636716b35ef0a4ac420e42fc35d19b1':
revise helpouts tags to use just one on each page
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:54:48 +0000 (17:54 +0000)]
am
0da6b005: revise helpouts tags to use just one on each page
* commit '
0da6b005c1cec9d7a4f6f3259e2deb4a67b37968':
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:48:44 +0000 (15:48 +0000)]
am
8129b8b4: am
dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
* commit '
8129b8b471e782708be945e40fa82d2c20ebceef':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
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:21:32 +0000 (15:21 +0000)]
am
bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev
* commit '
bdb1cf0c1bed1ae32d98c1efb269b87c9797182d':
docs: Add links to Wear UI training from Design pages.
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:25:48 +0000 (05:25 +0000)]
am
922e6b6a: am
81fcc85c: Merge "docs:studio-update-814" into lmp-docs
* commit '
922e6b6aae0c19b31073e925da7fc813ed54bd4c':
docs:studio-update-814
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:22:07 +0000 (03:22 +0000)]
am
3d875f80: am
cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE
* commit '
3d875f804018ebd48189633bb48ad6083c953eed':
If no display settings are matched, return the first one. DO NOT MERGE
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:29:18 +0000 (23:29 +0000)]
am
b31c2b07: am
397eb67f: Merge "docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905" into lmp-docs
* commit '
b31c2b07140481c2cd45367b16f77a710765bc85':
docs: Cherry pick from lmp-dev update screen shot Change-Id: I9eeed45c7dea9f1b988544c75a906f234a787905
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:39:09 +0000 (22:39 +0000)]
am
b5c5a0dc: am
7be03da0: (-s ours) Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
* commit '
b5c5a0dc429d1d1944296bb9f1da403126fabcc5':
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
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 20:01:13 +0000 (20:01 +0000)]
am
d2d8c553: am
e91c37de: Fixes wrongly nested braces. Bug:
17499985
* commit '
d2d8c55304438accd9589eaa0cb49fcaae3e54cd':
Fixes wrongly nested braces. Bug:
17499985
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:38:35 +0000 (15:38 +0000)]
am
e0acf536: am
e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs
* commit '
e0acf536a00cc30ab8420e43321096afba601024':
docs: Two-page notification fix.
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:26:18 +0000 (23:26 +0000)]
am
1649712f: am
13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
* commit '
1649712f8745f6b62e453b8b4a230374308732ce':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
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:19:46 +0000 (23:19 +0000)]
am
2b20b9d2: am
3e92c4a2: am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
* commit '
2b20b9d23a0cd5a70db95bc70bae832a6d1f356d':
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.
OSDN Git Service
