OSDN Git Service
Andrew Solovay [Fri, 22 Jul 2016 07:23:07 +0000 (07:23 +0000)]
Merge \"docs: Replacing curly apostrophes with straight ones am:
abea4b1dcd am:
85d40b4feb am:
bfeea1cc60\" into nyc-mr1-dev-plus-aosp
am:
1add4581c0
Change-Id: I54d55e09637b3dbccf0bca31c5f1d4a7d880cea6
Andrew Solovay [Fri, 22 Jul 2016 07:23:04 +0000 (07:23 +0000)]
docs: Replacing curly apostrophes with straight ones am:
abea4b1dcd am:
85d40b4feb am:
bfeea1cc60
am:
fe958e130f
Change-Id: I072ef469c361ff35317dae755ac3cc09998eda08
Todd Kennedy [Fri, 22 Jul 2016 07:19:09 +0000 (07:19 +0000)]
Merge changes Ia85b67a5,I8c228e91 into nyc-mr1-dev-plus-aosp
am:
d6899b7e51
Change-Id: I703e848b439a6d497321e416b633e940d843c627
Todd Kennedy [Fri, 22 Jul 2016 07:19:05 +0000 (07:19 +0000)]
Merge \\"use printwriter instead of stdout\\" into nyc-mr1-dev am:
b68b9e78dd
am:
6ee0fca3c5
Change-Id: Id7c112a9b12f87468537291f43280a8a8a491e68
Todd Kennedy [Fri, 22 Jul 2016 07:18:58 +0000 (07:18 +0000)]
use printwriter instead of stdout am:
b6e96e52e3
am:
3f3a2b2ef9
Change-Id: I30d27f5c07cea4367b0cbb144a293a728e63ad1e
Todd Kennedy [Fri, 22 Jul 2016 07:18:52 +0000 (07:18 +0000)]
Merge changes I330ccc68,I1a937e6a into nyc-mr1-dev-plus-aosp
am:
fd3572357a
Change-Id: I05c98fb35ec64fc75fbd70bede4f6a409ccfcfed
Todd Kennedy [Fri, 22 Jul 2016 07:18:49 +0000 (07:18 +0000)]
Merge \\"Skip failed package installs\\" into nyc-mr1-dev am:
8e62ae1109
am:
0625f1d01e
Change-Id: I732fb17b09589fe5ca9bc3d7c4cec72fbaebea2f
Todd Kennedy [Fri, 22 Jul 2016 07:18:43 +0000 (07:18 +0000)]
Skip failed package installs am:
6341244856
am:
3eadb90ae7
Change-Id: I44dfdde41c1b41f2ab30cc7f332ef0ebce93dd01
Makoto Onuki [Fri, 22 Jul 2016 07:18:37 +0000 (07:18 +0000)]
Merge changes I8acb11e9,I7461b7b5 into nyc-mr1-dev-plus-aosp
am:
a09c5e0151
Change-Id: I1bd232fb8784641d3a2b638bdc3b0031d1291fe1
Makoto Onuki [Fri, 22 Jul 2016 07:18:34 +0000 (07:18 +0000)]
Merge \\"Unit tests for \\"cmd shortcut\\"\\" into nyc-mr1-dev am:
3fa345b5c2
am:
0d258128f4
Change-Id: I67c936ef4c412f78f552a87821552bc21165aacb
Makoto Onuki [Fri, 22 Jul 2016 07:18:29 +0000 (07:18 +0000)]
Unit tests for \\"cmd shortcut\\" am:
0b9d1db5c1
am:
7d9f3e2ba3
Change-Id: I08ea6a4a92bdd23357d11b4624bd10c3704d3734
Yigit Boyar [Fri, 22 Jul 2016 07:18:23 +0000 (07:18 +0000)]
Merge changes from topic \'am-
ee369445e802497a9044c0f92a7615c8\' into nyc-mr1-dev-plus-aosp
am:
b218ce584e
Change-Id: Icddfc5c2a23641394a6f2c7ddf67d0a90a4bcc5a
Yigit Boyar [Fri, 22 Jul 2016 07:18:20 +0000 (07:18 +0000)]
Merge \\"Resolve ListView children\\'s RTL properties when added\\" into nyc-mr1-dev am:
93652f20f2
am:
0777a06d68
Change-Id: I426a4470a66f90b100ce6f0956f3ef83205cb8d0
Yigit Boyar [Fri, 22 Jul 2016 07:18:15 +0000 (07:18 +0000)]
Resolve ListView children\\'s RTL properties when added am:
4d827aafad
am:
b3c380ace7
Change-Id: Ib9c228c4af6385b0c662a620f8f62e1e6aaeeb52
Adam Powell [Fri, 22 Jul 2016 07:18:10 +0000 (07:18 +0000)]
Merge changes I8af6bd3c,Id3af05b3 into nyc-mr1-dev-plus-aosp
am:
55108ddd1a
Change-Id: Ic50f9f156879a65dd0b2c77113d7cbaa5327380a
Adam Powell [Fri, 22 Jul 2016 07:18:08 +0000 (07:18 +0000)]
Merge \\"Add View reveal on focus hint\\" into nyc-mr1-dev am:
5baca59226
am:
fa4ddfba99
Change-Id: I6717985245c75fea15f9ce9afc9645b23560fd72
Adam Powell [Fri, 22 Jul 2016 07:17:56 +0000 (07:17 +0000)]
Add View reveal on focus hint am:
7ec3fb3947
am:
e45f9d1bf6
Change-Id: I1f835ecb9d4e8226ae9f4800a888f557b7999357
Makoto Onuki [Fri, 22 Jul 2016 07:13:26 +0000 (07:13 +0000)]
Merge changes Ic2864e8a,I3007735d into nyc-mr1-dev-plus-aosp
am:
437fdf4d86
Change-Id: I271abb3043712f386587885276d5327cc977afd0
Makoto Onuki [Fri, 22 Jul 2016 07:13:23 +0000 (07:13 +0000)]
Merge \\"Follow-up to multiple intents support\\" into nyc-mr1-dev am:
7848856e6b
am:
9e15977f9c
Change-Id: I3eae91f50959c3531f92f75efa2e5a3695bfdc73
Makoto Onuki [Fri, 22 Jul 2016 07:13:17 +0000 (07:13 +0000)]
Follow-up to multiple intents support am:
0eed441c0c
am:
b6ed7b7552
Change-Id: I1034eaa7670c7fa983ddffcce295979ec86bde89
Sreevani Sreejith [Fri, 22 Jul 2016 07:13:12 +0000 (07:13 +0000)]
Merge \"Merge \\\"Merge \\\\\"docs: Fixed typo.\\\\\" into mnc-io-docs am:
71f742920d am:
9b911b8736\\\" into nyc-dev am:
7e9ce5ceaa am:
fb947ecf11\" into nyc-mr1-dev-plus-aosp
am:
a1124e027a
Change-Id: Icb958d02ef590e2299a99fcb3d58919bd1c30d60
Sreevani Sreejith [Fri, 22 Jul 2016 07:13:09 +0000 (07:13 +0000)]
Merge \\\"Merge \\\\\"docs: Fixed typo.\\\\\" into mnc-io-docs am:
71f742920d am:
9b911b8736\\\" into nyc-dev am:
7e9ce5ceaa am:
fb947ecf11
am:
04a39f258c
Change-Id: I325c46333954ffa745cee3e2368d64f61f619bb6
Sreevani Sreejith [Fri, 22 Jul 2016 07:12:59 +0000 (07:12 +0000)]
Merge \"Merge \\\\\"docs: Fixed typo.\\\\\" into mnc-io-docs am:
71f742920d am:
01f12a9e18 am:
daaa7b7e5b am:
05d873aaf5\" into nyc-mr1-dev-plus-aosp
am:
da0d9f894e
Change-Id: I193f33c7415805dfdf3f6edc917c8a0fc916f9fe
sreevanis [Fri, 22 Jul 2016 07:12:55 +0000 (07:12 +0000)]
Merge \\\\\"docs: Fixed typo.\\\\\" into mnc-io-docs am:
71f742920d am:
01f12a9e18 am:
daaa7b7e5b am:
05d873aaf5
am:
b6630f8e10
Change-Id: I7c6a7b970b4ac1ae46764e43598efda116a84eec
Selim Cinek [Fri, 22 Jul 2016 07:12:45 +0000 (07:12 +0000)]
Merge changes I0022344c,I1779f958,If1b1abb3 into nyc-mr1-dev-plus-aosp
am:
afe42013e4
Change-Id: I8bf78d5427c82288fa1d9256bb32a824acbe3a20
Selim Cinek [Fri, 22 Jul 2016 07:12:41 +0000 (07:12 +0000)]
Merge changes I4a7b64dc,Ic7df8d38 into nyc-mr1-dev am:
02965424b7
am:
1b01cd7998
Change-Id: Idd163a071a4efaa0bb4031c1e578d51f8d5fbec6
Selim Cinek [Fri, 22 Jul 2016 07:12:32 +0000 (07:12 +0000)]
Fixes a usability issue where groups were clearable am:
506deb69a7
am:
d8276a6af6
Change-Id: If5d93234e6cb07cbadd1f17907249dd11bd157be
Selim Cinek [Fri, 22 Jul 2016 07:11:42 +0000 (07:11 +0000)]
Fixed a bug where notifications could reappear am:
9e624e732a
am:
7a9aa2e5f4
Change-Id: I9fffc5e24865b74200fce4128bc83031d00c5180
Alan Viverette [Fri, 22 Jul 2016 07:11:35 +0000 (07:11 +0000)]
Merge changes I4c205ca9,I847e4d1e into nyc-mr1-dev-plus-aosp
am:
bd726e0f46
Change-Id: I6de06c765052a520b0d2edb2f57ad0ef999aacd8
Alan Viverette [Fri, 22 Jul 2016 07:11:32 +0000 (07:11 +0000)]
Merge \\"Remove date & time picker dialog titles to conform to Material spec\\" into nyc-mr1-dev am:
d2b30510c2
am:
811cfb452e
Change-Id: If0cf6f46a4e3810908d976bd077765cfda688e92
Alan Viverette [Fri, 22 Jul 2016 07:11:24 +0000 (07:11 +0000)]
Remove date & time picker dialog titles to conform to Material spec am:
5874c80c2a
am:
92c77fa9bb
Change-Id: Ic069e2821f0b3f74accc2612dd478fee25b10d82
Makoto Onuki [Fri, 22 Jul 2016 07:07:59 +0000 (07:07 +0000)]
Merge changes from topic \'am-
c3adaa91d98f4ee1af0e84b694db5f41\' into nyc-mr1-dev-plus-aosp
am:
fe2211ee58
Change-Id: I20232d71fec6bb149d806f134d549fe9b4c426a6
Makoto Onuki [Fri, 22 Jul 2016 07:07:56 +0000 (07:07 +0000)]
Merge \\"Update current.txt to reflect result type change\\" into nyc-mr1-dev am:
9e04446d6f
am:
6a5c243c2a
Change-Id: If91032c646ac1f5b021e806607eb0bd28c955dd6
Makoto Onuki [Fri, 22 Jul 2016 07:07:50 +0000 (07:07 +0000)]
Update current.txt to reflect result type change am:
79621c94ce
am:
bee35a6235
Change-Id: If3d043314eb58433c49a75960077f779499191e5
Brad Ebinger [Fri, 22 Jul 2016 07:07:41 +0000 (07:07 +0000)]
Merge changes from topic \'am-
91abecac10b94043be1419edddac2a94\' into nyc-mr1-dev-plus-aosp
am:
5baf9fa7fa
Change-Id: I2ff0998620a9ba8cc8c62cd79d76311fa7d583e5
Brad Ebinger [Fri, 22 Jul 2016 07:07:36 +0000 (07:07 +0000)]
Merge \\"Add CarrierConfig to remove hold during Ims Calls\\" into nyc-mr1-dev am:
dee7dffb5d
am:
0a01fc3f63
Change-Id: Ia399631a13874fe3ae900d86567be627d958aa14
Brad Ebinger [Fri, 22 Jul 2016 07:07:26 +0000 (07:07 +0000)]
Add CarrierConfig to remove hold during Ims Calls am:
c8601013d5
am:
f962fc424e
Change-Id: If6095d0e7809d22291423bd082af0ad9bd6fdc68
Robert Carr [Fri, 22 Jul 2016 07:07:13 +0000 (07:07 +0000)]
Merge changes I3e28ba03,I5fc3849b into nyc-mr1-dev-plus-aosp
am:
a01c797c04
Change-Id: I6fdb246132326294e3843409b42ee6da788e8e4e
Rob Carr [Fri, 22 Jul 2016 07:07:06 +0000 (07:07 +0000)]
Merge \\"Also report resize when frame changes without inset change.\\" into nyc-mr1-dev am:
736a5af504
am:
ebe1f3f71e
Change-Id: I0bd070c838f760ab63715429a9490b651c08359d
Robert Carr [Fri, 22 Jul 2016 07:06:53 +0000 (07:06 +0000)]
Also report resize when frame changes without inset change. am:
31aa98bea8
am:
e0b66c2964
Change-Id: Ib5b72acf703743db393174e6a58c6fa2d96c851a
Amanda Kassay [Fri, 22 Jul 2016 07:06:41 +0000 (07:06 +0000)]
Merge \"Merge \\\"Adding projec.yaml files to all top/sub categories.\\\" into nyc-dev am:
5a76378471 am:
ce78cff77e\" into nyc-mr1-dev-plus-aosp
am:
55d6135d01
Change-Id: I5411cb2b3ea9b9d5969736ae536b1428effd6531
Amanda Kassay [Fri, 22 Jul 2016 07:06:37 +0000 (07:06 +0000)]
Merge \\\"Adding projec.yaml files to all top/sub categories.\\\" into nyc-dev am:
5a76378471 am:
ce78cff77e
am:
820d191048
Change-Id: Idef83a88e11af1d602a5a1117d8603e895f2621e
Chih-Hung Hsieh [Fri, 22 Jul 2016 07:06:28 +0000 (07:06 +0000)]
Merge \"resolve merge conflicts of
3fb651b to nyc-mr1-dev-plus-aosp\" into nyc-mr1-dev-plus-aosp
am:
2d8ef6c26d
Change-Id: Ice9b7f3d21a15618c388d94da8b5b96137f6a4bf
TreeHugger Robot [Fri, 22 Jul 2016 06:59:58 +0000 (06:59 +0000)]
Merge "resolve merge conflicts of
f53bfc9 to master"
TreeHugger Robot [Fri, 22 Jul 2016 05:36:24 +0000 (05:36 +0000)]
Merge "Cap minimum visibilty of floating windows by the real size."
Stephen Hines [Fri, 22 Jul 2016 05:19:07 +0000 (22:19 -0700)]
resolve merge conflicts of
f53bfc9 to master
Change-Id: Idb454415b166b2ff215c604475dd9129958e7edd
Bill Yi [Fri, 22 Jul 2016 03:34:41 +0000 (03:34 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
d6498d1120 -s ours
am:
ce600b4e12 -s ours
Change-Id: Id9977bf5bea6d1e790f40652bc5abde18eda9b14
Bill Yi [Fri, 22 Jul 2016 03:34:35 +0000 (03:34 +0000)]
Import translations. DO NOT MERGE am:
7a81bcd670 -s ours
am:
bf5e412fd1 -s ours
Change-Id: I61ae596a9b42ed70e95e8709ab89b2b32782a774
Srinath Sridharan [Fri, 22 Jul 2016 03:34:32 +0000 (03:34 +0000)]
Merge \\"Adding a new getThreadScheduler() method.\\" into nyc-mr1-dev am:
6c92c0eb5c
am:
37de263d42
Change-Id: I07687f7b135622800bd68549a2efe3c445827b39
Srinath Sridharan [Fri, 22 Jul 2016 03:31:48 +0000 (03:31 +0000)]
Adding a new getThreadScheduler() method. am:
1b15d13243
am:
af8a8c54c8 -s ours
Change-Id: I861ebb75295b044e5dfb083c3d5f81c89a224e22
TreeHugger Robot [Fri, 22 Jul 2016 02:44:34 +0000 (02:44 +0000)]
Merge "Fix undefined fontScale issue in Configuration"
TreeHugger Robot [Fri, 22 Jul 2016 02:41:07 +0000 (02:41 +0000)]
Merge "Remove lines that hit ActivityMonitor on destory."
Android Build Merger (Role) [Fri, 22 Jul 2016 02:30:17 +0000 (02:30 +0000)]
Merge "docs: Replacing curly apostrophes with straight ones am:
abea4b1dcd am:
85d40b4feb am:
bfeea1cc60" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 22 Jul 2016 02:30:07 +0000 (02:30 +0000)]
Merge changes Ia85b67a5,I8c228e91 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"use printwriter instead of stdout\" into nyc-mr1-dev am:
b68b9e78dd
use printwriter instead of stdout am:
b6e96e52e3
Android Build Merger (Role) [Fri, 22 Jul 2016 02:29:52 +0000 (02:29 +0000)]
Merge changes I330ccc68,I1a937e6a into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Skip failed package installs\" into nyc-mr1-dev am:
8e62ae1109
Skip failed package installs am:
6341244856
Android Build Merger (Role) [Fri, 22 Jul 2016 02:29:36 +0000 (02:29 +0000)]
Merge changes I8acb11e9,I7461b7b5 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Unit tests for \"cmd shortcut\"\" into nyc-mr1-dev am:
3fa345b5c2
Unit tests for \"cmd shortcut\" am:
0b9d1db5c1
Android Build Merger (Role) [Fri, 22 Jul 2016 02:29:22 +0000 (02:29 +0000)]
Merge changes from topic 'am-
ee369445e802497a9044c0f92a7615c8' into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Resolve ListView children\'s RTL properties when added\" into nyc-mr1-dev am:
93652f20f2
Resolve ListView children\'s RTL properties when added am:
4d827aafad
Andrew Solovay [Fri, 22 Jul 2016 02:28:21 +0000 (02:28 +0000)]
docs: Replacing curly apostrophes with straight ones am:
abea4b1dcd am:
85d40b4feb
am:
bfeea1cc60
Change-Id: I766e5a663d44a1a786aa565d0f4d2259eeb1d90f
Todd Kennedy [Fri, 22 Jul 2016 02:28:14 +0000 (02:28 +0000)]
Merge \"use printwriter instead of stdout\" into nyc-mr1-dev
am:
b68b9e78dd
Change-Id: Ia85b67a52897c835d80d0f84581585271a1f4482
Todd Kennedy [Fri, 22 Jul 2016 02:28:07 +0000 (02:28 +0000)]
use printwriter instead of stdout
am:
b6e96e52e3
Change-Id: I8c228e916578a6e3bb5b38f95bacc1aa21d7b5ad
Todd Kennedy [Fri, 22 Jul 2016 02:27:53 +0000 (02:27 +0000)]
Merge \"Skip failed package installs\" into nyc-mr1-dev
am:
8e62ae1109
Change-Id: I330ccc68b42c75ba7c2ffd7dfc5413bc0c8c4ce4
Todd Kennedy [Fri, 22 Jul 2016 02:27:43 +0000 (02:27 +0000)]
Skip failed package installs
am:
6341244856
Change-Id: I1a937e6a2196981bc6d0aa8dd5b2cf1dbbd88648
Makoto Onuki [Fri, 22 Jul 2016 02:27:31 +0000 (02:27 +0000)]
Merge \"Unit tests for \"cmd shortcut\"\" into nyc-mr1-dev
am:
3fa345b5c2
Change-Id: I8acb11e9a55f48d4da1625a9811824bd2b176970
Makoto Onuki [Fri, 22 Jul 2016 02:27:22 +0000 (02:27 +0000)]
Unit tests for \"cmd shortcut\"
am:
0b9d1db5c1
Change-Id: I7461b7b5427a8c597bf5b3903c66a98a3dca25f8
Yigit Boyar [Fri, 22 Jul 2016 02:27:08 +0000 (02:27 +0000)]
Merge \"Resolve ListView children\'s RTL properties when added\" into nyc-mr1-dev
am:
93652f20f2
Change-Id: Ifb39f6566ef6fcb5509f10df9f980865d5c558c8
Yigit Boyar [Fri, 22 Jul 2016 02:26:58 +0000 (02:26 +0000)]
Resolve ListView children\'s RTL properties when added
am:
4d827aafad
Change-Id: I7ec85d33656cd1c7246c844e87143dcf3f4af57d
Android Build Merger (Role) [Fri, 22 Jul 2016 02:26:04 +0000 (02:26 +0000)]
Merge changes I8af6bd3c,Id3af05b3 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Add View reveal on focus hint\" into nyc-mr1-dev am:
5baca59226
Add View reveal on focus hint am:
7ec3fb3947
Android Build Merger (Role) [Fri, 22 Jul 2016 02:25:48 +0000 (02:25 +0000)]
Merge changes Ic2864e8a,I3007735d into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Follow-up to multiple intents support\" into nyc-mr1-dev am:
7848856e6b
Follow-up to multiple intents support am:
0eed441c0c
Android Build Merger (Role) [Fri, 22 Jul 2016 02:25:35 +0000 (02:25 +0000)]
Merge "Merge \\"Merge \\\\"docs: Fixed typo.\\\\" into mnc-io-docs am:
71f742920d am:
9b911b8736\\" into nyc-dev am:
7e9ce5ceaa am:
fb947ecf11" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 22 Jul 2016 02:25:25 +0000 (02:25 +0000)]
Merge "Merge \\\\"docs: Fixed typo.\\\\" into mnc-io-docs am:
71f742920d am:
01f12a9e18 am:
daaa7b7e5b am:
05d873aaf5" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 22 Jul 2016 02:25:13 +0000 (02:25 +0000)]
Merge changes I0022344c,I1779f958,If1b1abb3 into nyc-mr1-dev-plus-aosp
* changes:
Merge changes I4a7b64dc,Ic7df8d38 into nyc-mr1-dev am:
02965424b7
Fixes a usability issue where groups were clearable am:
506deb69a7
Fixed a bug where notifications could reappear am:
9e624e732a
Adam Powell [Fri, 22 Jul 2016 02:24:14 +0000 (02:24 +0000)]
Merge \"Add View reveal on focus hint\" into nyc-mr1-dev
am:
5baca59226
Change-Id: I8af6bd3cf6c1754fac0c37c722f5860187a3ed8e
Adam Powell [Fri, 22 Jul 2016 02:24:09 +0000 (02:24 +0000)]
Add View reveal on focus hint
am:
7ec3fb3947
Change-Id: Id3af05b3040821a94e3fd694d761fd317568fa5a
Makoto Onuki [Fri, 22 Jul 2016 02:24:03 +0000 (02:24 +0000)]
Merge \"Follow-up to multiple intents support\" into nyc-mr1-dev
am:
7848856e6b
Change-Id: Ic2864e8a32106b038165af62790b3b10e0d1266f
Makoto Onuki [Fri, 22 Jul 2016 02:24:00 +0000 (02:24 +0000)]
Follow-up to multiple intents support
am:
0eed441c0c
Change-Id: I3007735db610ddd8c608290ffac8edcdcf390758
Sreevani Sreejith [Fri, 22 Jul 2016 02:23:54 +0000 (02:23 +0000)]
Merge \\"Merge \\\\"docs: Fixed typo.\\\\" into mnc-io-docs am:
71f742920d am:
9b911b8736\\" into nyc-dev am:
7e9ce5ceaa
am:
fb947ecf11
Change-Id: Id1aad3ead6fa90f5f3d65d63a0797b3b69275e99
Sreevani Sreejith [Fri, 22 Jul 2016 02:23:50 +0000 (02:23 +0000)]
Merge \\\\"docs: Fixed typo.\\\\" into mnc-io-docs am:
71f742920d am:
01f12a9e18 am:
daaa7b7e5b
am:
05d873aaf5
Change-Id: I784b2abcc90e67ac4242f0bfc9ea2b9eb7b38e44
Selim Cinek [Fri, 22 Jul 2016 02:23:45 +0000 (02:23 +0000)]
Merge changes I4a7b64dc,Ic7df8d38 into nyc-mr1-dev
am:
02965424b7
Change-Id: I0022344cbb786b994f83c8d2547ff4070be7385d
Selim Cinek [Fri, 22 Jul 2016 02:23:41 +0000 (02:23 +0000)]
Fixes a usability issue where groups were clearable
am:
506deb69a7
Change-Id: I1779f958c6d3c926d88fb1971a2872323c229126
Selim Cinek [Fri, 22 Jul 2016 02:23:36 +0000 (02:23 +0000)]
Fixed a bug where notifications could reappear
am:
9e624e732a
Change-Id: If1b1abb34019cd59f285111ec8bb75df0e891f50
Android Build Merger (Role) [Fri, 22 Jul 2016 02:22:09 +0000 (02:22 +0000)]
Merge changes I4c205ca9,I847e4d1e into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Remove date & time picker dialog titles to conform to Material spec\" into nyc-mr1-dev am:
d2b30510c2
Remove date & time picker dialog titles to conform to Material spec am:
5874c80c2a
Android Build Merger (Role) [Fri, 22 Jul 2016 02:21:54 +0000 (02:21 +0000)]
Merge changes from topic 'am-
c3adaa91d98f4ee1af0e84b694db5f41' into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Update current.txt to reflect result type change\" into nyc-mr1-dev am:
9e04446d6f
Update current.txt to reflect result type change am:
79621c94ce
Android Build Merger (Role) [Fri, 22 Jul 2016 02:21:39 +0000 (02:21 +0000)]
Merge changes from topic 'am-
91abecac10b94043be1419edddac2a94' into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Add CarrierConfig to remove hold during Ims Calls\" into nyc-mr1-dev am:
dee7dffb5d
Add CarrierConfig to remove hold during Ims Calls am:
c8601013d5
Android Build Merger (Role) [Fri, 22 Jul 2016 02:21:23 +0000 (02:21 +0000)]
Merge changes I3e28ba03,I5fc3849b into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Also report resize when frame changes without inset change.\" into nyc-mr1-dev am:
736a5af504
Also report resize when frame changes without inset change. am:
31aa98bea8
Android Build Merger (Role) [Fri, 22 Jul 2016 02:21:08 +0000 (02:21 +0000)]
Merge "Merge \\"Adding projec.yaml files to all top/sub categories.\\" into nyc-dev am:
5a76378471 am:
ce78cff77e" into nyc-mr1-dev-plus-aosp
Benjamin Franz [Fri, 22 Jul 2016 02:21:03 +0000 (02:21 +0000)]
Merge \\\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093 am:
87534f4ac9 am:
cb805b35f3 -s ours am:
662e2a7975 am:
0eadbe6d36
am:
378b7d1f39 -s ours
Change-Id: I81c892217d6ca9296dcbb6c0a278827ffe7d8a1e
Billy Lamberta [Fri, 22 Jul 2016 02:21:00 +0000 (02:21 +0000)]
Merge \\\"docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919\\\" into nyc-dev am:
7dbcfcadd5 am:
199e855f9f
am:
a043fce41d
Change-Id: I4c18b11436fb9f7bbd932f6dae7d2997e38e3106
Billy Lamberta [Fri, 22 Jul 2016 02:20:56 +0000 (02:20 +0000)]
docs: work - Managed configuration bundles am:
ef57498142 am:
9684f2cd2f am:
c7cffa3e6a am:
cb3ae89fbd
am:
53d8d74853
Change-Id: I8a797e697ce602a506cea73091e93f6a7b14d47b
Alan Viverette [Fri, 22 Jul 2016 02:19:54 +0000 (02:19 +0000)]
Merge \"Remove date & time picker dialog titles to conform to Material spec\" into nyc-mr1-dev
am:
d2b30510c2
Change-Id: I4c205ca983c7d4ea2b1ba9f4c2ed071b467cb639
Alan Viverette [Fri, 22 Jul 2016 02:19:38 +0000 (02:19 +0000)]
Remove date & time picker dialog titles to conform to Material spec
am:
5874c80c2a
Change-Id: I847e4d1ed80e6c3b16a7a064929850606ca69a55
Makoto Onuki [Fri, 22 Jul 2016 02:19:29 +0000 (02:19 +0000)]
Merge \"Update current.txt to reflect result type change\" into nyc-mr1-dev
am:
9e04446d6f
Change-Id: I1cd1d4ee9dc3dd9debb86016a892e91645181420
Makoto Onuki [Fri, 22 Jul 2016 02:19:23 +0000 (02:19 +0000)]
Update current.txt to reflect result type change
am:
79621c94ce
Change-Id: I8b889c07ddc1fc8baaaf4594194c9acfc96a1379
Brad Ebinger [Fri, 22 Jul 2016 02:18:54 +0000 (02:18 +0000)]
Merge \"Add CarrierConfig to remove hold during Ims Calls\" into nyc-mr1-dev
am:
dee7dffb5d
Change-Id: I0566e045f656a88c361f0abce00fa469f1a83a51
TreeHugger Robot [Fri, 22 Jul 2016 02:16:58 +0000 (02:16 +0000)]
Merge "resolve merge conflicts of
3fb651b to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Brad Ebinger [Fri, 22 Jul 2016 02:16:21 +0000 (02:16 +0000)]
Add CarrierConfig to remove hold during Ims Calls
am:
c8601013d5
Change-Id: I61fe4dc7360fa5627185eabd96e76aa4c336b308
Robert Carr [Fri, 22 Jul 2016 02:16:12 +0000 (02:16 +0000)]
Merge \"Also report resize when frame changes without inset change.\" into nyc-mr1-dev
am:
736a5af504
Change-Id: I3e28ba038bac37470e63a0826ece2c76ec69776b
Robert Carr [Fri, 22 Jul 2016 02:16:07 +0000 (02:16 +0000)]
Also report resize when frame changes without inset change.
am:
31aa98bea8
Change-Id: I5fc3849b92a4ff13cf76a6e23298612fa48a2798
Amanda Kassay [Fri, 22 Jul 2016 02:16:02 +0000 (02:16 +0000)]
Merge \\"Adding projec.yaml files to all top/sub categories.\\" into nyc-dev am:
5a76378471
am:
ce78cff77e
Change-Id: I961da4993413646cd89e9fce3f338aad466e37bd
Chih-Hung Hsieh [Fri, 22 Jul 2016 02:14:36 +0000 (19:14 -0700)]
resolve merge conflicts of
3fb651b to nyc-mr1-dev-plus-aosp
Change-Id: I52d56e84620c85638798d949f8eb819387a01902
Bill Yi [Fri, 22 Jul 2016 02:13:25 +0000 (02:13 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
d6498d1120 -s ours
Change-Id: I40a278fefe8891467e6b7e3f01a1f18514b85fb0