OSDN Git Service
Vladislav Kaznacheev [Mon, 25 Jul 2016 23:05:22 +0000 (23:05 +0000)]
Fix AM.revokeUriPermissionFromOwner for prefix mode.
am:
4498aa6c58
Change-Id: I752efeb20f5fd28576babb7f90bdc79dbec02366
Philip P. Moltmann [Mon, 25 Jul 2016 23:05:14 +0000 (23:05 +0000)]
Merge \"Set title in onCreate.\" into nyc-mr1-dev
am:
fb5a07938f
Change-Id: Icfb399258314565515c151cb3d3b188b868a76b2
Philip P. Moltmann [Mon, 25 Jul 2016 23:05:10 +0000 (23:05 +0000)]
Set title in onCreate.
am:
fef31ad5ae
Change-Id: Ide036a4f9bed9953040be7aa0f0fee26f9c84c82
Android Build Merger (Role) [Mon, 25 Jul 2016 22:52:07 +0000 (22:52 +0000)]
Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev am:
65dfc2a3e5
Fix NPE in ValueAnimator am:
543a7ed7af
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:53 +0000 (22:51 +0000)]
Merge changes from topic 'am-
9fd0a895a44f4e7ebb6eebb2d79a62a9' into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev am:
4e0fc3ccd2
Enforce consistent sizes for arrays in SpannableStringInternal am:
83549088c6
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:38 +0000 (22:51 +0000)]
Merge changes Idf939fd3,I6ae3f730 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Handle USB power role \'sink\'\" into nyc-mr1-dev am:
d021ba34fb
Handle USB power role \'sink\' am:
0135516153
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:21 +0000 (22:51 +0000)]
Merge "Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am:
d579d713a5 am:
0da397ea71" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:03 +0000 (22:51 +0000)]
Merge "docs: updates to Buildilng Your First App doc am:
08d1bff71f am:
325ce1a475" into nyc-mr1-dev-plus-aosp
Justin Klaassen [Mon, 25 Jul 2016 22:50:11 +0000 (22:50 +0000)]
Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev
am:
65dfc2a3e5
Change-Id: I1acc3a4f5e540900f6e798e924ff26d5ab954d89
Justin Klaassen [Mon, 25 Jul 2016 22:50:07 +0000 (22:50 +0000)]
Fix NPE in ValueAnimator
am:
543a7ed7af
Change-Id: Ib049d75f8c8460c3e7498080bbe502e67078e6ac
Raph Levien [Mon, 25 Jul 2016 22:49:47 +0000 (22:49 +0000)]
Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev
am:
4e0fc3ccd2
Change-Id: I1d9951d56d0ba4893e4b09fb984cde3328ec390a
Raph Levien [Mon, 25 Jul 2016 22:49:14 +0000 (22:49 +0000)]
Enforce consistent sizes for arrays in SpannableStringInternal
am:
83549088c6
Change-Id: I6fd3b65dd388abcce6f8b7062f396a6fcf8fdf7a
Philip P. Moltmann [Mon, 25 Jul 2016 22:49:02 +0000 (22:49 +0000)]
Merge \"Handle USB power role \'sink\'\" into nyc-mr1-dev
am:
d021ba34fb
Change-Id: Idf939fd3875a4b232ebde6cd43a6d03e13f85a36
Philip P. Moltmann [Mon, 25 Jul 2016 22:48:54 +0000 (22:48 +0000)]
Handle USB power role \'sink\'
am:
0135516153
Change-Id: I6ae3f73072d811fc4319ff8c498962fc1802fb6f
Mark Lu [Mon, 25 Jul 2016 22:48:49 +0000 (22:48 +0000)]
Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am:
d579d713a5
am:
0da397ea71
Change-Id: Ifafd54ba11ada726905b9e0fc3a936d59ffd968d
Mark Lu [Mon, 25 Jul 2016 22:48:45 +0000 (22:48 +0000)]
docs: updates to Buildilng Your First App doc am:
08d1bff71f
am:
325ce1a475
Change-Id: Ia206bc01acd7eb17ed3ce2074c84f479351b970f
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:47 +0000 (22:47 +0000)]
Merge changes I39b8c6a5,I6a15fdea,I459d3e01 into nyc-mr1-dev-plus-aosp
* changes:
Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev am:
52a11f7c64
Fixes a bug where the lockscreen would be frozen am:
3127daf036
Allow home button to be tapped while a incoming call shows a HUN am:
64be772e03
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:30 +0000 (22:47 +0000)]
Merge changes I19e53731,I12ec6445 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"QS: Cleanup detail toggle on\" into nyc-mr1-dev am:
5c6f5afd19
QS: Cleanup detail toggle on am:
35a9c14cc6
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:17 +0000 (22:47 +0000)]
Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"QS: Fixup footer + animations\" into nyc-mr1-dev am:
425023fcda
QS: Fixup footer + animations am:
df36aed859
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:03 +0000 (22:47 +0000)]
Merge changes I5a1e9d04,Ic6f20e06 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Don\'t reset layout params when repositioning\" into nyc-mr1-dev am:
961492cc30
Don\'t reset layout params when repositioning am:
90dfb89916
Android Build Merger (Role) [Mon, 25 Jul 2016 22:46:46 +0000 (22:46 +0000)]
Merge "Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am:
fc0bc7bf96 am:
dd756c26e2" into nyc-mr1-dev-plus-aosp
Selim Cinek [Mon, 25 Jul 2016 22:45:40 +0000 (22:45 +0000)]
Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev
am:
52a11f7c64
Change-Id: I39b8c6a55804b088705889888d006695ef54231d
Selim Cinek [Mon, 25 Jul 2016 22:45:36 +0000 (22:45 +0000)]
Fixes a bug where the lockscreen would be frozen
am:
3127daf036
Change-Id: I6a15fdea3a17a9f6991931edfcd6aa7b224ff159
Selim Cinek [Mon, 25 Jul 2016 22:45:30 +0000 (22:45 +0000)]
Allow home button to be tapped while a incoming call shows a HUN
am:
64be772e03
Change-Id: I459d3e0160f0b4acdd64e31dc31948685a98cf2a
Jason Monk [Mon, 25 Jul 2016 22:45:24 +0000 (22:45 +0000)]
Merge \"QS: Cleanup detail toggle on\" into nyc-mr1-dev
am:
5c6f5afd19
Change-Id: I19e5373128c30c46838ba80d3a4d49581f7793ee
Jason Monk [Mon, 25 Jul 2016 22:45:21 +0000 (22:45 +0000)]
QS: Cleanup detail toggle on
am:
35a9c14cc6
Change-Id: I12ec6445c3536235d900f23af57bedf9efcdec28
Jason Monk [Mon, 25 Jul 2016 22:45:15 +0000 (22:45 +0000)]
Merge \"QS: Fixup footer + animations\" into nyc-mr1-dev
am:
425023fcda
Change-Id: I2107c3557322dea92559e469218fae0a7fb174b4
Jason Monk [Mon, 25 Jul 2016 22:45:11 +0000 (22:45 +0000)]
QS: Fixup footer + animations
am:
df36aed859
Change-Id: I60b5e161595199b8d7dd9ae9f6932f3d9075b9fb
Jorim Jaggi [Mon, 25 Jul 2016 22:45:06 +0000 (22:45 +0000)]
Merge \"Don\'t reset layout params when repositioning\" into nyc-mr1-dev
am:
961492cc30
Change-Id: I5a1e9d04eaaacd63ffa5e6d9d7874c636b45addc
Jorim Jaggi [Mon, 25 Jul 2016 22:45:02 +0000 (22:45 +0000)]
Don\'t reset layout params when repositioning
am:
90dfb89916
Change-Id: Ic6f20e06700728935bb0bfc3bc983b068d05079b
Dirk Dougherty [Mon, 25 Jul 2016 22:44:57 +0000 (22:44 +0000)]
Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am:
fc0bc7bf96
am:
dd756c26e2
Change-Id: I52d47ffe259c163031a931f566f0eaa9fa0657e2
Mark Lu [Mon, 25 Jul 2016 22:43:41 +0000 (22:43 +0000)]
Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am:
d579d713a5
am:
041ac3d576
Change-Id: I27935655a4b00ef82dd6eb59ffe25bcc4f41220c
Mark Lu [Mon, 25 Jul 2016 22:43:36 +0000 (22:43 +0000)]
docs: updates to Buildilng Your First App doc am:
08d1bff71f
am:
04fb0c328d
Change-Id: Iaa8c32faaef6e0ebd34d81d2be7797ffa49a1f6a
Dirk Dougherty [Mon, 25 Jul 2016 22:43:30 +0000 (22:43 +0000)]
Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am:
fc0bc7bf96
am:
b653777ae3
Change-Id: I0bee12de83f9262afc89459c33d0f450d02e8065
Elliot Waite [Mon, 25 Jul 2016 22:39:04 +0000 (22:39 +0000)]
resolve merge conflicts of
c4ae782 to nyc-dev-plus-aosp
am:
66641f8ec5
Change-Id: Ie46a3e22905ba61eedb1c5b26a838d77c680d829
Mark Lu [Mon, 25 Jul 2016 22:38:18 +0000 (22:38 +0000)]
Merge \"docs: updates to Buildilng Your First App doc\" into nyc-dev
am:
d579d713a5
Change-Id: Id58dd0692053ddbf41a93d6f2e45d78c4ef50df5
Mark Lu [Mon, 25 Jul 2016 22:38:08 +0000 (22:38 +0000)]
docs: updates to Buildilng Your First App doc
am:
08d1bff71f
Change-Id: I66aa204bf8618ab5af8613fac350d511b3f0486b
Elliot Waite [Mon, 25 Jul 2016 22:37:56 +0000 (22:37 +0000)]
Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev
am:
fc0bc7bf96
Change-Id: Ib71dafd15bb5b6fb16cb44fd0fa659b2f100118e
TreeHugger Robot [Mon, 25 Jul 2016 21:26:36 +0000 (21:26 +0000)]
Merge "Set title in onCreate." into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 21:01:46 +0000 (21:01 +0000)]
Merge "Fix NPE in ValueAnimator" into nyc-mr1-dev
Dirk Dougherty [Mon, 25 Jul 2016 20:10:42 +0000 (13:10 -0700)]
resolve merge conflicts of
c88afb6 to nyc-mr1-dev-plus-aosp
Change-Id: I4f9e194d2e07852799cafabae7289a61cae18bb3
Raph Levien [Mon, 25 Jul 2016 20:52:39 +0000 (20:52 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-mr1-dev
Dirk Dougherty [Mon, 25 Jul 2016 20:47:53 +0000 (13:47 -0700)]
resolve merge conflicts of
c4ae782 to nyc-dev-plus-aosp
Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3
TreeHugger Robot [Mon, 25 Jul 2016 20:23:13 +0000 (20:23 +0000)]
Merge "Handle USB power role 'sink'" into nyc-mr1-dev
Philip P. Moltmann [Mon, 25 Jul 2016 20:07:56 +0000 (13:07 -0700)]
Set title in onCreate.
This makes sure the accessibility service recognizes the correcy title.
Fixes:
30220082
Change-Id: Ieaa37818a55c7b2e543bbe8bd8836996ef0529d2
Justin Klaassen [Sat, 23 Jul 2016 02:30:03 +0000 (19:30 -0700)]
Fix NPE in ValueAnimator
- Reset mAnimationEndRequested to false in ValueAnimator#start(boolean)
so that previously canceled animated (with a start delay) can be
canceled again.
- In ObjectAnimator#animateValue(float) check if target == null
regardless of mTarget == null since it's possible the target was
explicitly set to null prior to the animator being cancelled.
Bug:
30190459
Change-Id: I6da55737df30a28f48355fc7a41ab91d05979deb
Mark Lu [Mon, 25 Jul 2016 18:59:59 +0000 (18:59 +0000)]
Merge \"docs: updates to Buildilng Your First App doc\" into nyc-dev
am:
d579d713a5
Change-Id: Iaea16a4bd5271a9ef50e0e27556f491a0ac0d314
Mark Lu [Mon, 25 Jul 2016 18:59:56 +0000 (18:59 +0000)]
docs: updates to Buildilng Your First App doc
am:
08d1bff71f
Change-Id: I030bd03c3f83ecc8332165dea75785cc78c3a114
Selim Cinek [Mon, 25 Jul 2016 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic 'home-button-lock-nyc-mr1-dev' into nyc-mr1-dev
* changes:
Fixes a bug where the lockscreen would be frozen
Allow home button to be tapped while a incoming call shows a HUN
TreeHugger Robot [Mon, 25 Jul 2016 18:45:50 +0000 (18:45 +0000)]
Merge "docs: updates to Buildilng Your First App doc" into nyc-dev
Jason Monk [Mon, 25 Jul 2016 18:38:37 +0000 (18:38 +0000)]
Merge "QS: Cleanup detail toggle on" into nyc-mr1-dev
Jason Monk [Mon, 25 Jul 2016 18:36:00 +0000 (18:36 +0000)]
Merge "QS: Fixup footer + animations" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 18:34:33 +0000 (18:34 +0000)]
Merge "Don't reset layout params when repositioning" into nyc-mr1-dev
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: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
Mark Lu [Fri, 15 Jul 2016 20:36:55 +0000 (13:36 -0700)]
docs: updates to Buildilng Your First App doc
This commit includes the following updates:
- replaces Basic activity with Empty activity
- uses default values wherever possible
- removes instructions for floating button
- removes SDK instructions. Users must use Android Studio
- updates the SDK version to API 15
- combines some instructions that were too text heavy
Bug:
29766869
Bug:
29768686
Bug:
19154557
Change-Id: Id819cb2dde74b68b5145dfefe7a8502892bb377a
Elliot Waite [Mon, 25 Jul 2016 17:14:58 +0000 (17:14 +0000)]
Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev
am:
fc0bc7bf96
Change-Id: Id9bf642ea3d5105efbfa4663ced5c6f660e0fd7f
Elliot Waite [Mon, 25 Jul 2016 17:14:56 +0000 (17:14 +0000)]
Fix code tags that contain html encoded characters, and fix at links.
am:
c4ae7827e2
Change-Id: I9d5adc8d151a6d6ed1b8f81630bbf8a93329f181
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
Dirk Dougherty [Mon, 25 Jul 2016 17:00:18 +0000 (17:00 +0000)]
Merge "Fix code tags that contain html encoded characters, and fix at links." into nyc-dev
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
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: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
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: I1b3bbeab2964c0712d59abab76f43d0d13ddb7d6
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: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
OSDN Git Service
