OSDN Git Service
Yuqian Li [Mon, 25 Jul 2016 20:27:01 +0000 (20:27 +0000)]
Merge "More efficient text rendering on path"
TreeHugger Robot [Mon, 25 Jul 2016 20:17:02 +0000 (20:17 +0000)]
Merge "Potential fix for flaky tests."
TreeHugger Robot [Mon, 25 Jul 2016 19:26:21 +0000 (19:26 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal"
TreeHugger Robot [Mon, 25 Jul 2016 19:23:54 +0000 (19:23 +0000)]
Merge "Evict thumbnail caches and delay dismissing spinner on refresh finish."
Svetoslav Ganov [Mon, 25 Jul 2016 18:43:38 +0000 (18:43 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
Alexandria Cornwall [Mon, 25 Jul 2016 18:29:00 +0000 (18:29 +0000)]
Merge "AAPT2: Convert StringPool flattening to UTF-8"
TreeHugger Robot [Mon, 25 Jul 2016 18:25:45 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 25 Jul 2016 18:21:27 +0000 (18:21 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 25 Jul 2016 18:18:56 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 25 Jul 2016 18:18:36 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 25 Jul 2016 18:18:08 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE"
Muyuan Li [Mon, 25 Jul 2016 17:56:53 +0000 (17:56 +0000)]
Merge "sysui: changed split screen shortcut key behavior."
Bill Yi [Mon, 25 Jul 2016 17:50:33 +0000 (17:50 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
a2d4d0b599 -s ours
am:
502796fe08 -s ours
Change-Id: I047291f0785d1f2597910ca7aa2d191b19f20b33
Bill Yi [Mon, 25 Jul 2016 17:50:29 +0000 (17:50 +0000)]
Import translations. DO NOT MERGE am:
da6099ec45 -s ours
am:
ec3463c4b0 -s ours
Change-Id: I17e4e7038060fc5dcc887fb2bde509850819dd1a
Garfield, Tan [Fri, 22 Jul 2016 17:30:49 +0000 (10:30 -0700)]
Evict thumbnail caches and delay dismissing spinner on refresh finish.
Bug:
28334455
Change-Id: I338f83744d7f8b2fe9a9265dcab7ed4ec81edbfb
(cherry picked from commit
dce173d1a011c07205b4b90da79d24d08e4cf90a)
Yuqian Li [Mon, 18 Jul 2016 17:07:42 +0000 (13:07 -0400)]
More efficient text rendering on path
Change-Id: I004c15473b527df0f296c54a6a3e9b29505fd9b9
Ben Lin [Sat, 23 Jul 2016 01:31:36 +0000 (18:31 -0700)]
Potential fix for flaky tests.
1) Fixing orientation of test devices to their natural orientation
(Phone is usually portrait, and most big tablets are landscape). We
unfreeze the orientation at tearDown because if we don't, the device
will be permanently locked to that orientation.
2) Adding closerDrawer() to FileManagementUiTest and RootsUiTest.
Bug:
30190207
Change-Id: Iec90ee8d46fef1acbf5b04fe718810edbf99da0c
(cherry picked from commit
73a59e9a02f09e61037e4fb8275d283f3861fe90)
Muyuan Li [Fri, 22 Jul 2016 22:47:51 +0000 (15:47 -0700)]
sysui: changed split screen shortcut key behavior.
Instead of cycling between 1/4, 1/2, 3/4 with
consecutive Meta + [ / Meta + ] keys, it dismisses
the activity completely when it goes below 1/4 or 3/4.
Bug:
30075277
Change-Id: I326f4d163537ae96f1845714a8bd56b2b0d58984
(cherry picked from commit
b29eeada668b298f9c0e41bd4d4b9fe1f690247e)
TreeHugger Robot [Mon, 25 Jul 2016 17:32:14 +0000 (17:32 +0000)]
Merge "Force application context for KeyChain bindings"
Bill Yi [Mon, 25 Jul 2016 17:21:56 +0000 (17:21 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
f968d50316 -s ours
am:
0f0e9f9495 -s ours
Change-Id: Ie4bfc3af362ca81a2ffebcd6dc29c786a19c4663
Bill Yi [Mon, 25 Jul 2016 17:18:33 +0000 (17:18 +0000)]
Import translations. DO NOT MERGE am:
9d1117531d -s ours
am:
90eb138a47 -s ours
Change-Id: I4937c4a1811e766126e0ccfa0b5b92173b34ab9f
Bill Yi [Mon, 25 Jul 2016 17:18:30 +0000 (17:18 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
bc3ae84aeb -s ours
am:
d348d8ea15 -s ours
Change-Id: I9da6987a159d0a0883abe147369be040a96c74dd
Bill Yi [Mon, 25 Jul 2016 17:18:27 +0000 (17:18 +0000)]
Import translations. DO NOT MERGE am:
48ca6ecfdd -s ours
am:
7a9f8268cb -s ours
Change-Id: Id2a5f073aec979475cf0a5171ff57124b0d7ba6e
Bill Yi [Mon, 25 Jul 2016 17:18:23 +0000 (17:18 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
0f840998b1 -s ours
am:
b661920d7b -s ours
Change-Id: I2f421ed16509260db268f5b2d78a4b67caf14d06
Bill Yi [Mon, 25 Jul 2016 17:18:19 +0000 (17:18 +0000)]
Import translations. DO NOT MERGE am:
148b5baa6d -s ours
am:
bd0c11d83c -s ours
Change-Id: Icd4943ec35aedcef00d059bd8031dc354e34afcf
Bill Yi [Mon, 25 Jul 2016 17:15:31 +0000 (17:15 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
a2d4d0b599 -s ours
Change-Id: I61ff6cde5c1e725d4c5f5cdf8bbc18f7ddcd5815
Bill Yi [Mon, 25 Jul 2016 17:15:28 +0000 (17:15 +0000)]
Import translations. DO NOT MERGE
am:
da6099ec45 -s ours
Change-Id: I31e6241df14f4ff88fc81884367f56c5c29b58de
Raph Levien [Mon, 25 Jul 2016 17:05:35 +0000 (10:05 -0700)]
Enforce consistent sizes for arrays in SpannableStringInternal
The grow logic in SpannableStringInternal#setSpan assumes that the
size of mSpanData is consistent with that of mSpans, in particular
that if the latter doesn't need to grow, neither does the former.
The copySpans() method didn't enforce this, creating an mSpanData
array only big enough to hold the data.
This patch documents the invariant in a comment and enforces it.
Bug:
30359314
Change-Id: Ie25db70a76836e97af8476a7f5c10cb4b976c1cf
Bill Yi [Mon, 25 Jul 2016 17:00:37 +0000 (17:00 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
f968d50316 -s ours
Change-Id: Iaabf52aa58d57eba60e82e574ac32b9369aa8f3e
Bill Yi [Mon, 25 Jul 2016 17:00:33 +0000 (17:00 +0000)]
Import translations. DO NOT MERGE
am:
9d1117531d -s ours
Change-Id: Ied6a0ad5a2cf96f05ddb99e00d263d3fb76685f0
Bill Yi [Mon, 25 Jul 2016 17:00:28 +0000 (17:00 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
bc3ae84aeb -s ours
Change-Id: Ie02f25016bae9a1c54b475fed3f252bc3942adb0
Bill Yi [Mon, 25 Jul 2016 17:00:24 +0000 (17:00 +0000)]
Import translations. DO NOT MERGE
am:
48ca6ecfdd -s ours
Change-Id: I50f90f0a203cc1eef797b39a539aaa77f431ae64
Bill Yi [Mon, 25 Jul 2016 17:00:20 +0000 (17:00 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
0f840998b1 -s ours
Change-Id: I1aa6f6c4f9ccd70e39b38c7aeb461e35e1046e04
Bill Yi [Mon, 25 Jul 2016 17:00:17 +0000 (17:00 +0000)]
Import translations. DO NOT MERGE
am:
148b5baa6d -s ours
Change-Id: I5d389606379097f891ac05b4a3bd1fe0a14e5616
TreeHugger Robot [Mon, 25 Jul 2016 16:51:05 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 16:50:42 +0000 (16:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 16:50:24 +0000 (16:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Agnieszka Madurska [Mon, 25 Jul 2016 16:49:41 +0000 (16:49 +0000)]
Merge \\"Add support for round scroll bars to View.java\\" into nyc-mr1-dev am:
8ec317e220
am:
24395bb23f
Change-Id: I26a8d64c505f72a613acf2f3c11a86e45b2b39ab
Aga Madurska [Mon, 25 Jul 2016 16:49:37 +0000 (16:49 +0000)]
Add support for round scroll bars to View.java am:
b19d0f9800
am:
009fab6070
Change-Id: I4f6808ca48fcc9d336b57c0edea15d632e28f8b7
Alexandria Cornwall [Fri, 22 Jul 2016 23:25:02 +0000 (16:25 -0700)]
AAPT2: Convert StringPool flattening to UTF-8
Convert StringPools in resources.arsc and binary XML files to use UTF-8
instead of UTF-16 to save lots of bytes.
Bug:
30053277
Change-Id: I8eb6c78644e51b15f89edadab71cc86f5a851a45
TreeHugger Robot [Mon, 25 Jul 2016 16:46:27 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Aga Madurska [Mon, 25 Jul 2016 16:40:01 +0000 (16:40 +0000)]
Merge \"Add support for round scroll bars to View.java\" into nyc-mr1-dev
am:
8ec317e220
Change-Id: I3a3db1106b4a3b009b54559189155a7fbefff977
Aga Madurska [Mon, 25 Jul 2016 16:39:58 +0000 (16:39 +0000)]
Add support for round scroll bars to View.java
am:
b19d0f9800
Change-Id: I23faff9b31a9a71c767aaabca69774f8582bfdb2
Agnieszka Madurska [Mon, 25 Jul 2016 16:31:35 +0000 (16:31 +0000)]
Merge "Add support for round scroll bars to View.java" into nyc-mr1-dev
Kevin Hufnagle [Mon, 25 Jul 2016 16:30:12 +0000 (16:30 +0000)]
Merge \\\"Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a\\\" into nyc-dev am:
30588da701 am:
29d74d6490
am:
64ad3125e3
Change-Id: Ieac2ac5c7cd63a983e2a6dabbe35082ab8e1067a
Kevin Hufnagle [Mon, 25 Jul 2016 16:30:04 +0000 (16:30 +0000)]
Merge \"Merge \\\"Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a\\\" into nyc-dev am:
30588da701 am:
0837e3ee9f\" into nyc-mr1-dev-plus-aosp
am:
4cb31186b7
Change-Id: I8774e13f08e60702070d5f6df658bdd0dceec032
Kevin Hufnagle [Mon, 25 Jul 2016 16:29:56 +0000 (16:29 +0000)]
Merge \\\"Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a\\\" into nyc-dev am:
30588da701 am:
0837e3ee9f
am:
d2aea93737
Change-Id: I80f1c6bd82548363b63ebb73b197d9f0483fa9d7
Kevin Hufnagle [Mon, 25 Jul 2016 16:16:11 +0000 (16:16 +0000)]
Merge \"Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a am:
616ba9d22b am:
f16f31b643\" into nyc-mr1-dev-plus-aosp
am:
1e2354f4f7
Change-Id: I4a7037b119cbffb447c9116edb0f374ec805b3be
Kevin Hufnagle [Mon, 25 Jul 2016 16:16:03 +0000 (16:16 +0000)]
Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a am:
616ba9d22b am:
f16f31b643
am:
35ebbd4e4b
Change-Id: I67eb209ade06924186e2fb7f8e013742e66183e6
Kevin Hufnagle [Mon, 25 Jul 2016 16:15:32 +0000 (16:15 +0000)]
Merge \"Merge \\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\\\" into nyc-dev am:
aa57295104 am:
00f04508da\" into nyc-mr1-dev-plus-aosp
am:
daccf00568
Change-Id: I38b5e21cb9f8667dd8b7ed6273f97219ef8a48b9
Kevin Hufnagle [Mon, 25 Jul 2016 16:15:17 +0000 (16:15 +0000)]
Merge \\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\\\" into nyc-dev am:
aa57295104 am:
00f04508da
am:
8e73dfae9a
Change-Id: Ib4b498baf1e5f0b1499d1e8cee528eba9edbb4f1
Kevin Hufnagle [Mon, 25 Jul 2016 16:14:47 +0000 (16:14 +0000)]
Merge \"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480 am:
15865b5c67 am:
83cd591aa2\" into nyc-mr1-dev-plus-aosp
am:
44277c919a
Change-Id: I502a165c329f2af7634428cbcd5cf6a8b55d5b4c
Kevin Hufnagle [Mon, 25 Jul 2016 16:14:39 +0000 (16:14 +0000)]
docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480 am:
15865b5c67 am:
83cd591aa2
am:
b16247e166
Change-Id: Ib1721a43486e946c0e042731768678c504f2c6b2
Kevin Hufnagle [Mon, 25 Jul 2016 16:14:27 +0000 (16:14 +0000)]
Merge \"Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a am:
616ba9d22b am:
39c3cf6914\" into nyc-mr1-dev-plus-aosp
am:
1d2cbecc84
Change-Id: Idafdce95c0f917400bc319daa5951162bcf11206
Kevin Hufnagle [Mon, 25 Jul 2016 16:14:24 +0000 (16:14 +0000)]
Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a am:
616ba9d22b am:
39c3cf6914
am:
86dbf87653
Change-Id: I6a32991c91da6bf2e6e7d35a851f7d49df055cb2
Kevin Hufnagle [Mon, 25 Jul 2016 16:14:14 +0000 (16:14 +0000)]
Merge \"Merge \\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\\\" into nyc-dev am:
aa57295104 am:
ed0eb35760\" into nyc-mr1-dev-plus-aosp
am:
349f20542a
Change-Id: Id1071d6fb20f05831494a77e83ac1a197fc84228
Kevin Hufnagle [Mon, 25 Jul 2016 16:14:11 +0000 (16:14 +0000)]
Merge \\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\\\" into nyc-dev am:
aa57295104 am:
ed0eb35760
am:
ab4cfb5701
Change-Id: Ieaf5d7bdb7bd870160ce2144de1b0f890ff5370e
Kevin Hufnagle [Mon, 25 Jul 2016 16:09:30 +0000 (16:09 +0000)]
Merge \\"Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a\\" into nyc-dev am:
30588da701
am:
29d74d6490
Change-Id: I66dd02cc039305c93d49744019ba9c589b4d7b20
Kevin Hufnagle [Mon, 25 Jul 2016 16:09:12 +0000 (16:09 +0000)]
Merge \"Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am:
c46ee88f9a am:
c59557649c am:
29df77dd86 am:
92cdc875ca\" into nyc-mr1-dev-plus-aosp
am:
5edc09ff7e
Change-Id: I53248efa275d6b03c4db8217ce6877dcb974825c
Kevin Hufnagle [Mon, 25 Jul 2016 16:08:33 +0000 (16:08 +0000)]
Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am:
c46ee88f9a am:
c59557649c am:
29df77dd86 am:
92cdc875ca
am:
6c39c8acf9
Change-Id: I6a1b083cc5ea3e1651c342ad735eab2500f357fd
Kevin Hufnagle [Mon, 25 Jul 2016 16:08:09 +0000 (16:08 +0000)]
Merge \"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480 am:
15865b5c67 am:
bb09bc1844\" into nyc-mr1-dev-plus-aosp
am:
83e6fb53ba
Change-Id: I1c87d7f2e8ccb8183eba4ef26cf20a4cb515b88b
Kevin Hufnagle [Mon, 25 Jul 2016 16:08:02 +0000 (16:08 +0000)]
docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480 am:
15865b5c67 am:
bb09bc1844
am:
3650105621
Change-Id: Ib50cf72460297e1ca1ac5e5aa3ab7c69bb8bc328
Kevin Hufnagle [Mon, 25 Jul 2016 16:07:47 +0000 (16:07 +0000)]
Merge \"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
22be9b1a87 am:
b65288fcb5 am:
c0c9e529db\" into nyc-mr1-dev-plus-aosp
am:
2f7b99f6c3
Change-Id: I5084605d402e557c739c12f5e2815c9095868cc5
Kevin Hufnagle [Mon, 25 Jul 2016 16:07:43 +0000 (16:07 +0000)]
docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
22be9b1a87 am:
b65288fcb5 am:
c0c9e529db
am:
fbfdc768b3
Change-Id: Iefb9d03bb39d5be21b0a7d6b37458e20976bdf4b
Kevin Hufnagle [Mon, 25 Jul 2016 16:07:33 +0000 (16:07 +0000)]
Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am:
c46ee88f9a am:
c59557649c am:
29df77dd86 am:
904359a7d8
am:
16792f6fda
Change-Id: Idd3a0dee78980a806f0d9c9f8acb950f2653c3b4
Kevin Hufnagle [Mon, 25 Jul 2016 16:07:30 +0000 (16:07 +0000)]
docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am:
7ce51cf350 am:
22be9b1a87 am:
b65288fcb5 am:
0ae0f4044b
am:
95d9b984e8
Change-Id: Ifb75946d5a0d65b6de0b092728ae3465a69f7445
Android Build Merger (Role) [Mon, 25 Jul 2016 16:04:01 +0000 (16:04 +0000)]
Merge "Merge \\"Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a\\" into nyc-dev am:
30588da701 am:
0837e3ee9f" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Mon, 25 Jul 2016 16:03:41 +0000 (16:03 +0000)]
Merge \\"Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a\\" into nyc-dev am:
30588da701
am:
0837e3ee9f
Change-Id: Ieb085590082f77889e0d0480e0024c318009b821
Android Build Merger (Role) [Mon, 25 Jul 2016 16:02:43 +0000 (16:02 +0000)]
Merge "Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a am:
616ba9d22b am:
f16f31b643" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 16:02:20 +0000 (16:02 +0000)]
Merge "Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\\" into nyc-dev am:
aa57295104 am:
00f04508da" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 16:02:04 +0000 (16:02 +0000)]
Merge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480 am:
15865b5c67 am:
83cd591aa2" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 16:01:53 +0000 (16:01 +0000)]
Merge "Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a am:
616ba9d22b am:
39c3cf6914" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 16:01:41 +0000 (16:01 +0000)]
Merge "Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\\" into nyc-dev am:
aa57295104 am:
ed0eb35760" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 16:01:33 +0000 (16:01 +0000)]
Merge "Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am:
c46ee88f9a am:
c59557649c am:
29df77dd86 am:
92cdc875ca" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 16:01:29 +0000 (16:01 +0000)]
Merge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480 am:
15865b5c67 am:
bb09bc1844" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 16:01:19 +0000 (16:01 +0000)]
Merge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
22be9b1a87 am:
b65288fcb5 am:
c0c9e529db" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:27 +0000 (16:00 +0000)]
Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a am:
616ba9d22b
am:
f16f31b643
Change-Id: Ia27e2660da9bce190a4f1ef00063f05908d54e30
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:23 +0000 (16:00 +0000)]
Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\\" into nyc-dev am:
aa57295104
am:
00f04508da
Change-Id: I4e41e8f9727ac536c4e82d330f0b71ba3b32e64a
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:20 +0000 (16:00 +0000)]
Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a am:
616ba9d22b
am:
39c3cf6914
Change-Id: Idb26480f3b8ee14c74e8ad7f1964b7f9bc3c6c86
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:18 +0000 (16:00 +0000)]
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480 am:
15865b5c67
am:
83cd591aa2
Change-Id: I1cc06fe60744773aa4958a9e6dcd6ad5fcb9ff86
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:17 +0000 (16:00 +0000)]
Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\\" into nyc-dev am:
aa57295104
am:
ed0eb35760
Change-Id: I870b0e3e44be97b5a462a43318d3658e3d7d4570
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:15 +0000 (16:00 +0000)]
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480 am:
15865b5c67
am:
bb09bc1844
Change-Id: I629d8c59c107dde1586da8275335486f8c8502be
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:14 +0000 (16:00 +0000)]
Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am:
c46ee88f9a am:
c59557649c am:
29df77dd86
am:
92cdc875ca
Change-Id: I7cdc5f957234d09daf0c8cea61dfd0001a660f0c
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:13 +0000 (16:00 +0000)]
Merge \\\\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc.\\\\" into mnc-io-docs am:
c46ee88f9a am:
c59557649c am:
29df77dd86
am:
904359a7d8
Change-Id: Ic5a7452c92daea87dbb35d3505248fe5e838da63
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:10 +0000 (16:00 +0000)]
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
22be9b1a87 am:
b65288fcb5
am:
c0c9e529db
Change-Id: I96a342cd1141aab6774c8995753047f2a8f7c6aa
Kevin Hufnagle [Mon, 25 Jul 2016 16:00:10 +0000 (16:00 +0000)]
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am:
7ce51cf350 am:
22be9b1a87 am:
b65288fcb5
am:
0ae0f4044b
Change-Id: Ia223466cd55f2ffa9a41d27861eb5e3c64c7c59d
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:57 +0000 (15:53 +0000)]
Merge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a\" into nyc-dev
am:
30588da701
Change-Id: I252f462a12d2381ac01a966f5787bff9e2a60cd5
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:57 +0000 (15:53 +0000)]
Merge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a\" into nyc-dev
am:
30588da701
Change-Id: I1b3bbeab2964c0712d59abab76f43d0d13ddb7d6
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:45 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a
am:
616ba9d22b
Change-Id: I43d14c18de0fd9f5168e5a1350713e36515dedcc
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:43 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a
am:
616ba9d22b
Change-Id: I5656f3aaba73ccdc6ac5b98158bc5ff1220b67e5
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:25 +0000 (15:53 +0000)]
Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\" into nyc-dev
am:
aa57295104
Change-Id: I844fe4bdfd6fef705ce0450ae71a8a9fa1c76ee0
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:24 +0000 (15:53 +0000)]
Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480\" into nyc-dev
am:
aa57295104
Change-Id: I87db649cfa3c4ea702cb0b0ae40d65aec2cc5619
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:17 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480
am:
15865b5c67
Change-Id: I036e11173b14975721c542973cb794aaf3f1b44a
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:17 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480
am:
15865b5c67
Change-Id: I7a4149cae91c3564c6c6fa88c2cfa1d7bad2fe30
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:10 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am:
c46ee88f9a am:
c59557649c
am:
29df77dd86
Change-Id: Ic45e915b80fd0ca6ab30868fc8b3e103f106f4c9
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:10 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am:
c46ee88f9a am:
c59557649c
am:
29df77dd86
Change-Id: I219ea7001581bdd0eb1fa3e6cfd7f3a7bda63ed3
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:07 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:
7ce51cf350 am:
22be9b1a87
am:
b65288fcb5
Change-Id: Ia2e1fd9035cd9eeda2173871eab80da73c89c613
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:06 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am:
7ce51cf350 am:
22be9b1a87
am:
b65288fcb5
Change-Id: I34605fa43f1c4ddd26baa7f4d06760cdb602d41e
Android Build Merger (Role) [Mon, 25 Jul 2016 15:46:55 +0000 (15:46 +0000)]
Merge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am:
c46ee88f9a am:
260e77f68a" into nyc-dev
Android Build Merger (Role) [Mon, 25 Jul 2016 15:46:33 +0000 (15:46 +0000)]
Merge "docs: Fixed option for \\"launchMode\\" within Android manifest doc. am:
7ce51cf350 am:
e059c15480" into nyc-dev
OSDN Git Service
