OSDN Git Service
Adrian Roos [Fri, 22 Jul 2016 20:19:10 +0000 (20:19 +0000)]
Merge \"Notification icons: Correctly apply color filter for DrawableContainers\" into nyc-mr1-dev
am:
db56fb36a6
Change-Id: Ic66714c31c3328b4560a093082e0bdee553be497
Adrian Roos [Fri, 22 Jul 2016 20:19:06 +0000 (20:19 +0000)]
Notification icons: Correctly apply color filter for DrawableContainers
am:
4aad455280
Change-Id: Iec4e932b0c7f2cb1674eb8c617730c2376e47d6f
Adrian Roos [Fri, 22 Jul 2016 20:12:19 +0000 (20:12 +0000)]
Merge "Notification icons: Correctly apply color filter for DrawableContainers" into nyc-mr1-dev
Selim Cinek [Fri, 22 Jul 2016 19:30:12 +0000 (19:30 +0000)]
Merge changes Idd0b38b4,I511356a8 into nyc-mr1-dev
am:
0ff47b64cd
Change-Id: I6a7e46b4c10ecce4cd038aa90ec4536fed61d3ae
Selim Cinek [Fri, 22 Jul 2016 19:30:04 +0000 (19:30 +0000)]
Fixed a bug where the fade in from dark would not work properly
am:
7baaa9e82b
Change-Id: I28983239557395c52e33dff4f610731c5f0bc8e4
Selim Cinek [Fri, 22 Jul 2016 19:29:52 +0000 (19:29 +0000)]
Changed the appearance of fullscreen intent notifications again
am:
981962e6ad
Change-Id: Ib26d711e48aaff99a4e64e86feb67dbf987d67e2
TreeHugger Robot [Fri, 22 Jul 2016 19:20:48 +0000 (19:20 +0000)]
Merge changes Idd0b38b4,I511356a8 into nyc-mr1-dev
* changes:
Fixed a bug where the fade in from dark would not work properly
Changed the appearance of fullscreen intent notifications again
Selim Cinek [Fri, 22 Jul 2016 00:21:09 +0000 (17:21 -0700)]
Fixed a bug where the fade in from dark would not work properly
Change-Id: Idd0b38b40b06806c727d8e033847a0da0b51f55e
Fixes:
30224123
Selim Cinek [Thu, 21 Jul 2016 03:41:58 +0000 (20:41 -0700)]
Changed the appearance of fullscreen intent notifications again
Change-Id: I511356a8dc0fe253541c625fb7b43ed0c7bafaca
Fixes:
28269355
Andrii Kulian [Fri, 22 Jul 2016 18:20:36 +0000 (18:20 +0000)]
Merge \"Make sure to apply latest configuration to resources\" into nyc-mr1-dev
am:
8fcd8f1fb9
Change-Id: I994329624e4312c1e6eb018793d08fe0a041c4b1
Andrii Kulian [Fri, 22 Jul 2016 18:20:32 +0000 (18:20 +0000)]
Make sure to apply latest configuration to resources
am:
3b3c914e62
Change-Id: I5dc1d3518b1568bd8c52c947e7425563553bcf9d
Andrii Kulian [Fri, 22 Jul 2016 18:16:34 +0000 (18:16 +0000)]
Merge "Make sure to apply latest configuration to resources" into nyc-mr1-dev
Chong Zhang [Fri, 22 Jul 2016 17:17:30 +0000 (17:17 +0000)]
Merge \"Clean up surfaces when app is resumed without being stopped.\" into nyc-mr1-dev
am:
e86da3bc62
Change-Id: Ifae55b72ab9d1310a9647ef8a0c3ee2c4e49b055
Chong Zhang [Fri, 22 Jul 2016 17:17:26 +0000 (17:17 +0000)]
Clean up surfaces when app is resumed without being stopped.
am:
45e6d2dc8b
Change-Id: I9ae5c2a9c6a93246338221252cf943db6763e1c4
Adrian Roos [Fri, 22 Jul 2016 17:17:21 +0000 (17:17 +0000)]
Merge \"ServiceConnection: Properly serialize events\" into nyc-mr1-dev
am:
1dcda85414
Change-Id: I8dd496db509da805a22ad59dbc8e98df0c1052d5
Adrian Roos [Fri, 22 Jul 2016 17:17:18 +0000 (17:17 +0000)]
ServiceConnection: Properly serialize events
am:
a9b43182c6
Change-Id: I3571754de4d659aaf6b4a61fa14ae8256ca29f7a
Chong Zhang [Fri, 22 Jul 2016 17:07:44 +0000 (17:07 +0000)]
Merge "Clean up surfaces when app is resumed without being stopped." into nyc-mr1-dev
Adrian Roos [Fri, 22 Jul 2016 17:03:42 +0000 (17:03 +0000)]
Merge "ServiceConnection: Properly serialize events" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 22 Jul 2016 08:55:28 +0000 (08:55 +0000)]
Merge "Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am:
f97faada5d am:
6b69f6597e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 22 Jul 2016 08:55:09 +0000 (08:55 +0000)]
Merge "Block user from setting safe boot setting via adb am:
0ff13fce6f am:
36eb7a1370" into nyc-mr1-dev-plus-aosp
Benjamin Franz [Fri, 22 Jul 2016 08:54:35 +0000 (08:54 +0000)]
Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am:
f97faada5d
am:
6b69f6597e
Change-Id: I2e3d13a01d8d2443c522a6b611b8c1068aebd5f6
Benjamin Franz [Fri, 22 Jul 2016 08:54:31 +0000 (08:54 +0000)]
Block user from setting safe boot setting via adb am:
0ff13fce6f
am:
36eb7a1370
Change-Id: I63ad7dc4f3acbfd3e3d5dd7f236721df9c80b950
Benjamin Franz [Fri, 22 Jul 2016 08:54:24 +0000 (08:54 +0000)]
Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am:
f97faada5d
am:
e84d37f1ee
Change-Id: Iecce325f92455edfac8065a843dacf2f938bb560
Benjamin Franz [Fri, 22 Jul 2016 08:54:21 +0000 (08:54 +0000)]
Block user from setting safe boot setting via adb am:
0ff13fce6f
am:
c86e8c3442
Change-Id: Ie9e1f4d447dd61ef7f5ef191d1309377fbbf4559
Benjamin Franz [Fri, 22 Jul 2016 08:47:48 +0000 (08:47 +0000)]
Merge \"Block user from setting safe boot setting via adb\" into nyc-dev
am:
f97faada5d
Change-Id: Ifba1f49a4411450cbe782fc2a1aded6bb7e4c186
Benjamin Franz [Fri, 22 Jul 2016 08:47:40 +0000 (08:47 +0000)]
Block user from setting safe boot setting via adb
am:
0ff13fce6f
Change-Id: Ic8da0b5ffbc285f4371f68c189054a0005b90751
Benjamin Franz [Fri, 22 Jul 2016 08:47:37 +0000 (08:47 +0000)]
Merge \"Block user from setting safe boot setting via adb\" into nyc-dev
am:
f97faada5d
Change-Id: I8f2fad8933d62c0424632c7fcd5e158aa1b0d4bf
Benjamin Franz [Fri, 22 Jul 2016 08:47:32 +0000 (08:47 +0000)]
Block user from setting safe boot setting via adb
am:
0ff13fce6f
Change-Id: I50db586478eb52d0a2f43e9150cc663c96e5779b
Benjamin Franz [Fri, 22 Jul 2016 08:37:30 +0000 (08:37 +0000)]
Merge "Block user from setting safe boot setting via adb" into nyc-dev
Dan Sandler [Fri, 22 Jul 2016 04:45:33 +0000 (04:45 +0000)]
Merge \"Decrease default longpress timeout to 400ms.\" into nyc-mr1-dev
am:
c3bdde9790
Change-Id: I4c4a3239435d45a4ace79e616d4fd5c436a79073
Dan Sandler [Fri, 22 Jul 2016 04:45:28 +0000 (04:45 +0000)]
Decrease default longpress timeout to 400ms.
am:
71f85e9194
Change-Id: I0daedfc5d6d2c0b98feda11f1930eaf3fdca7e76
Daniel Sandler [Fri, 22 Jul 2016 04:41:28 +0000 (04:41 +0000)]
Merge "Decrease default longpress timeout to 400ms." into nyc-mr1-dev
Alan Viverette [Fri, 22 Jul 2016 03:02:43 +0000 (03:02 +0000)]
Merge \"Better docs for ImageView legacy tint\" into nyc-mr1-dev
am:
123db917b2
Change-Id: I2976e59e695fb20f6395778ea3404642f2cc3bed
Alan Viverette [Fri, 22 Jul 2016 03:02:39 +0000 (03:02 +0000)]
Better docs for ImageView legacy tint
am:
2b4e14cfcc
Change-Id: I72f67ee9c67501ba9ea827f0068186673f59d852
Makoto Onuki [Fri, 22 Jul 2016 03:02:34 +0000 (03:02 +0000)]
Merge \"Fix realCallingUid/Pid for startActivities()\" into nyc-mr1-dev
am:
8c5dce5636
Change-Id: Ia5476479a40aef18f46b3a26d75a0af08e8aeb8f
Makoto Onuki [Fri, 22 Jul 2016 03:02:30 +0000 (03:02 +0000)]
Fix realCallingUid/Pid for startActivities()
am:
d67b187dcc
Change-Id: Id782c18b4c7c9bb0067553620f008eeafed26356
Alan Viverette [Fri, 22 Jul 2016 02:50:38 +0000 (02:50 +0000)]
Merge "Better docs for ImageView legacy tint" into nyc-mr1-dev
Makoto Onuki [Fri, 22 Jul 2016 02:49:11 +0000 (02:49 +0000)]
Merge "Fix realCallingUid/Pid for startActivities()" into nyc-mr1-dev
Andrew Solovay [Fri, 22 Jul 2016 02:38:18 +0000 (02:38 +0000)]
Merge \\\"docs: Replacing curly apostrophes with straight ones\\\" into nyc-docs am:
1d545c4f83 am:
adfb20c2f0
am:
d50b5a9262
Change-Id: Iac84c6d08d02cd350610df471dcb25f9211bf05e
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
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
Bill Yi [Fri, 22 Jul 2016 02:13:22 +0000 (02:13 +0000)]
Import translations. DO NOT MERGE
am:
7a81bcd670 -s ours
Change-Id: Ice2ddc3fe3979638b402fab4e5fe58b4a5d23a40
Srinath Sridharan [Fri, 22 Jul 2016 02:13:18 +0000 (02:13 +0000)]
Merge \"Adding a new getThreadScheduler() method.\" into nyc-mr1-dev
am:
6c92c0eb5c
Change-Id: I34c5380121bd805a0c8afe35ab82cf149ba3e79c
Srinath Sridharan [Fri, 22 Jul 2016 02:13:13 +0000 (02:13 +0000)]
Adding a new getThreadScheduler() method.
am:
1b15d13243
Change-Id: Ie15ad328a687bac65e1505e2c324536d3eb0102a
Benjamin Franz [Fri, 22 Jul 2016 02:13:07 +0000 (02:13 +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
Change-Id: I44f878a88710950bdee31c326c6b3b465999e7c4
Billy Lamberta [Fri, 22 Jul 2016 02:13:02 +0000 (02:13 +0000)]
Merge \\"docs: work - Managed configuration bundles am:
ef57498142 am:
ba633fc919\\" into nyc-dev am:
7dbcfcadd5
am:
199e855f9f
Change-Id: I7a3f484d68b1c79e2fa9905b1283411220134fee
Billy Lamberta [Fri, 22 Jul 2016 02:12:54 +0000 (02:12 +0000)]
docs: work - Managed configuration bundles am:
ef57498142 am:
9684f2cd2f am:
c7cffa3e6a
am:
cb3ae89fbd
Change-Id: Ic24fdb8902d85766d6f4aa9ed79367310b358726
Chih-hung Hsieh [Fri, 22 Jul 2016 01:53:29 +0000 (01:53 +0000)]
resolve merge conflicts of
5152fd9 to stage-aosp-master
am:
05160d70d1
Change-Id: Id1d734fd162d6063fdc818afc68f09809f764c5f
Amanda Kassay [Fri, 22 Jul 2016 01:45:48 +0000 (01:45 +0000)]
Fix for b/
30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am:
83fb75ded3 am:
e9d58227bb
am:
576bda4222
Change-Id: I4514cd8829df2c6aec1abecc03e8044e82c30ecc
Mark Lu [Fri, 22 Jul 2016 01:45:44 +0000 (01:45 +0000)]
Merge \\"docs: fixed \\'@\\' signs that were escaped improperly\\" into nyc-dev am:
a7ce29962c
am:
081b4b3265
Change-Id: Ied462165f9a794a6d213ee93b4876e52d139e200
Erik Kline [Fri, 22 Jul 2016 01:45:39 +0000 (01:45 +0000)]
Support removing specific routes from local_network
am:
6599ee8b96
Change-Id: I51a341796698ff02aa7a62f5f8b66050982f488e
Bill Yi [Fri, 22 Jul 2016 01:45:35 +0000 (01:45 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
e3f28911af -s ours
Change-Id: I57bb5d48154f9eadbe6657d3af6861fc1f673ee9
Bill Yi [Fri, 22 Jul 2016 01:45:31 +0000 (01:45 +0000)]
Import translations. DO NOT MERGE
am:
8eff1c381b -s ours
Change-Id: Ifea203c04a0312a552568b842e464252e3506cb7
Mark Salyzyn [Fri, 22 Jul 2016 01:45:14 +0000 (01:45 +0000)]
Merge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
am:
1a48150980
Change-Id: I1e9eb21d5df60caf717e056bb571e93add127075
Mark Salyzyn [Fri, 22 Jul 2016 01:44:47 +0000 (01:44 +0000)]
Settings: add logpersist kernel only selection (strings)
am:
66b89bc2da
Change-Id: I296fcbdc2bfee105bc0ce838c75989d32e14b12e
Mark Salyzyn [Fri, 22 Jul 2016 01:39:47 +0000 (01:39 +0000)]
Settings: add logpersist selection (strings)
am:
3e05a70543 -s ours
Change-Id: Ia4d081b5db59fdc2f518d04129216f8d014bdbbe
Chih-Hung Hsieh [Fri, 22 Jul 2016 01:13:31 +0000 (18:13 -0700)]
resolve merge conflicts of
5152fd9 to stage-aosp-master
Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3
OSDN Git Service
