Dirk Dougherty
|
5c5663e7ab
|
Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am: fc0bc7bf96
am: b653777ae3
Change-Id: I0bee12de83f9262afc89459c33d0f450d02e8065
|
2016-07-25 22:43:30 +00:00 |
|
Elliot Waite
|
b8500c9d6b
|
resolve merge conflicts of c4ae782 to nyc-dev-plus-aosp
am: 66641f8ec5
Change-Id: Ie46a3e22905ba61eedb1c5b26a838d77c680d829
|
2016-07-25 22:39:04 +00:00 |
|
Elliot Waite
|
b653777ae3
|
Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev
am: fc0bc7bf96
Change-Id: Ib71dafd15bb5b6fb16cb44fd0fa659b2f100118e
|
2016-07-25 22:37:56 +00:00 |
|
Dirk Dougherty
|
8d79dc9350
|
resolve merge conflicts of c88afb6 to nyc-mr1-dev-plus-aosp
Change-Id: I4f9e194d2e07852799cafabae7289a61cae18bb3
|
2016-07-25 13:53:18 -07:00 |
|
Dirk Dougherty
|
66641f8ec5
|
resolve merge conflicts of c4ae782 to nyc-dev-plus-aosp
Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3
|
2016-07-25 13:47:53 -07:00 |
|
Bill Yi
|
502796fe08
|
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: a2d4d0b599 -s ours
Change-Id: I61ff6cde5c1e725d4c5f5cdf8bbc18f7ddcd5815
|
2016-07-25 17:15:31 +00:00 |
|
Bill Yi
|
ec3463c4b0
|
Import translations. DO NOT MERGE
am: da6099ec45 -s ours
Change-Id: I31e6241df14f4ff88fc81884367f56c5c29b58de
|
2016-07-25 17:15:28 +00:00 |
|
Elliot Waite
|
c88afb6e3e
|
Fix code tags that contain html encoded characters, and fix at links.
am: c4ae7827e2
Change-Id: I9d5adc8d151a6d6ed1b8f81630bbf8a93329f181
|
2016-07-25 17:14:56 +00:00 |
|
Bill Yi
|
0f0e9f9495
|
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: f968d50316 -s ours
Change-Id: Iaabf52aa58d57eba60e82e574ac32b9369aa8f3e
|
2016-07-25 17:00:37 +00:00 |
|
Bill Yi
|
90eb138a47
|
Import translations. DO NOT MERGE
am: 9d1117531d -s ours
Change-Id: Ied6a0ad5a2cf96f05ddb99e00d263d3fb76685f0
|
2016-07-25 17:00:33 +00:00 |
|
Bill Yi
|
d348d8ea15
|
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: bc3ae84aeb -s ours
Change-Id: Ie02f25016bae9a1c54b475fed3f252bc3942adb0
|
2016-07-25 17:00:28 +00:00 |
|
Bill Yi
|
7a9f8268cb
|
Import translations. DO NOT MERGE
am: 48ca6ecfdd -s ours
Change-Id: I50f90f0a203cc1eef797b39a539aaa77f431ae64
|
2016-07-25 17:00:24 +00:00 |
|
Bill Yi
|
b661920d7b
|
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 0f840998b1 -s ours
Change-Id: I1aa6f6c4f9ccd70e39b38c7aeb461e35e1046e04
|
2016-07-25 17:00:20 +00:00 |
|
Dirk Dougherty
|
fc0bc7bf96
|
Merge "Fix code tags that contain html encoded characters, and fix at links." into nyc-dev
|
2016-07-25 17:00:19 +00:00 |
|
Bill Yi
|
bd0c11d83c
|
Import translations. DO NOT MERGE
am: 148b5baa6d -s ours
Change-Id: I5d389606379097f891ac05b4a3bd1fe0a14e5616
|
2016-07-25 17:00:17 +00:00 |
|
TreeHugger Robot
|
a2d4d0b599
|
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
|
2016-07-25 16:51:07 +00:00 |
|
TreeHugger Robot
|
f968d50316
|
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
|
2016-07-25 16:50:43 +00:00 |
|
TreeHugger Robot
|
bc3ae84aeb
|
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
|
2016-07-25 16:50:25 +00:00 |
|
TreeHugger Robot
|
0f840998b1
|
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
|
2016-07-25 16:46:28 +00:00 |
|
Aga Madurska
|
24395bb23f
|
Merge \"Add support for round scroll bars to View.java\" into nyc-mr1-dev
am: 8ec317e220
Change-Id: I3a3db1106b4a3b009b54559189155a7fbefff977
|
2016-07-25 16:40:01 +00:00 |
|
Aga Madurska
|
009fab6070
|
Add support for round scroll bars to View.java
am: b19d0f9800
Change-Id: I23faff9b31a9a71c767aaabca69774f8582bfdb2
|
2016-07-25 16:39:58 +00:00 |
|
Agnieszka Madurska
|
8ec317e220
|
Merge "Add support for round scroll bars to View.java" into nyc-mr1-dev
|
2016-07-25 16:31:36 +00:00 |
|
Kevin Hufnagle
|
64ad3125e3
|
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
|
2016-07-25 16:09:30 +00:00 |
|
Android Build Merger (Role)
|
4cb31186b7
|
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
|
2016-07-25 16:04:02 +00:00 |
|
Kevin Hufnagle
|
d2aea93737
|
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
|
2016-07-25 16:03:41 +00:00 |
|
Android Build Merger (Role)
|
1e2354f4f7
|
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
|
2016-07-25 16:02:44 +00:00 |
|
Android Build Merger (Role)
|
daccf00568
|
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
|
2016-07-25 16:02:22 +00:00 |
|
Android Build Merger (Role)
|
44277c919a
|
Merge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 am: 15865b5c67 am: 83cd591aa2" into nyc-mr1-dev-plus-aosp
|
2016-07-25 16:02:05 +00:00 |
|
Android Build Merger (Role)
|
1d2cbecc84
|
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
|
2016-07-25 16:01:55 +00:00 |
|
Android Build Merger (Role)
|
349f20542a
|
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
|
2016-07-25 16:01:42 +00:00 |
|
Android Build Merger (Role)
|
5edc09ff7e
|
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
|
2016-07-25 16:01:35 +00:00 |
|
Android Build Merger (Role)
|
83e6fb53ba
|
Merge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 am: 15865b5c67 am: bb09bc1844" into nyc-mr1-dev-plus-aosp
|
2016-07-25 16:01:31 +00:00 |
|
Android Build Merger (Role)
|
2f7b99f6c3
|
Merge "docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87 am: b65288fcb5 am: c0c9e529db" into nyc-mr1-dev-plus-aosp
|
2016-07-25 16:01:20 +00:00 |
|
Kevin Hufnagle
|
35ebbd4e4b
|
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
|
2016-07-25 16:00:27 +00:00 |
|
Kevin Hufnagle
|
8e73dfae9a
|
Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\\" into nyc-dev am: aa57295104
am: 00f04508da
Change-Id: I4e41e8f9727ac536c4e82d330f0b71ba3b32e64a
|
2016-07-25 16:00:23 +00:00 |
|
Kevin Hufnagle
|
86dbf87653
|
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
|
2016-07-25 16:00:20 +00:00 |
|
Kevin Hufnagle
|
b16247e166
|
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 am: 15865b5c67
am: 83cd591aa2
Change-Id: I1cc06fe60744773aa4958a9e6dcd6ad5fcb9ff86
|
2016-07-25 16:00:18 +00:00 |
|
Kevin Hufnagle
|
ab4cfb5701
|
Merge \\"docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\\" into nyc-dev am: aa57295104
am: ed0eb35760
Change-Id: I870b0e3e44be97b5a462a43318d3658e3d7d4570
|
2016-07-25 16:00:17 +00:00 |
|
Kevin Hufnagle
|
3650105621
|
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 am: 15865b5c67
am: bb09bc1844
Change-Id: I629d8c59c107dde1586da8275335486f8c8502be
|
2016-07-25 16:00:15 +00:00 |
|
Kevin Hufnagle
|
6c39c8acf9
|
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
|
2016-07-25 16:00:14 +00:00 |
|
Kevin Hufnagle
|
16792f6fda
|
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
|
2016-07-25 16:00:13 +00:00 |
|
Kevin Hufnagle
|
fbfdc768b3
|
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87 am: b65288fcb5
am: c0c9e529db
Change-Id: I96a342cd1141aab6774c8995753047f2a8f7c6aa
|
2016-07-25 16:00:10 +00:00 |
|
Kevin Hufnagle
|
95d9b984e8
|
docs: Fixed option for \\\\"launchMode\\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87 am: b65288fcb5
am: 0ae0f4044b
Change-Id: Ia223466cd55f2ffa9a41d27861eb5e3c64c7c59d
|
2016-07-25 16:00:10 +00:00 |
|
Kevin Hufnagle
|
0837e3ee9f
|
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
|
2016-07-25 15:53:57 +00:00 |
|
Kevin Hufnagle
|
29d74d6490
|
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
|
2016-07-25 15:53:57 +00:00 |
|
Kevin Hufnagle
|
39c3cf6914
|
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a
am: 616ba9d22b
Change-Id: I43d14c18de0fd9f5168e5a1350713e36515dedcc
|
2016-07-25 15:53:45 +00:00 |
|
Kevin Hufnagle
|
f16f31b643
|
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a
am: 616ba9d22b
Change-Id: I5656f3aaba73ccdc6ac5b98158bc5ff1220b67e5
|
2016-07-25 15:53:43 +00:00 |
|
Kevin Hufnagle
|
ed0eb35760
|
Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\" into nyc-dev
am: aa57295104
Change-Id: I844fe4bdfd6fef705ce0450ae71a8a9fa1c76ee0
|
2016-07-25 15:53:25 +00:00 |
|
Kevin Hufnagle
|
00f04508da
|
Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\" into nyc-dev
am: aa57295104
Change-Id: I87db649cfa3c4ea702cb0b0ae40d65aec2cc5619
|
2016-07-25 15:53:24 +00:00 |
|
Kevin Hufnagle
|
83cd591aa2
|
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480
am: 15865b5c67
Change-Id: I036e11173b14975721c542973cb794aaf3f1b44a
|
2016-07-25 15:53:17 +00:00 |
|