OSDN Git Service
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
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: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: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:
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: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: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: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: I219ea7001581bdd0eb1fa3e6cfd7f3a7bda63ed3
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
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:56 +0000 (15:45 +0000)]
Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am:
c46ee88f9a
am:
260e77f68a
Change-Id: Id931a4e007b696368cb7a074e3dcc11d6ac896eb
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:51 +0000 (15:45 +0000)]
docs: Fixed option for \\"launchMode\\" within Android manifest doc. am:
7ce51cf350
am:
e059c15480
Change-Id: Ic42a2ab9c49b3c40b5743f095d17be90a3414ad9
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:47 +0000 (15:45 +0000)]
Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am:
c46ee88f9a
am:
c59557649c
Change-Id: Icfd32ab1899fd098a9afc3532f8c29accf17b56d
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:45 +0000 (15:45 +0000)]
docs: Fixed option for \\"launchMode\\" within Android manifest doc. am:
7ce51cf350
am:
22be9b1a87
Change-Id: Ie27aa01933ac6f8854efb626d8bb776af6d1cf7d
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:27 +0000 (15:39 +0000)]
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs
am:
c46ee88f9a
Change-Id: I4197d61f056148f06978c2471b2b1ebf25b37881
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:22 +0000 (15:39 +0000)]
docs: Fixed option for \"launchMode\" within Android manifest doc.
am:
7ce51cf350
Change-Id: I1c16676d7a605c8a4c5d7b9bb0b2075c2e0c4355
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:20 +0000 (15:39 +0000)]
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs
am:
c46ee88f9a
Change-Id: Ibdfcea6f97b7969d1cc1a4c1ad13b3274c69a80a
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:18 +0000 (15:39 +0000)]
docs: Fixed option for \"launchMode\" within Android manifest doc.
am:
7ce51cf350
Change-Id: I013c71c0c64ff66ee5deb9810cd97312ed87b2e4
Kevin Hufnagle [Mon, 25 Jul 2016 15:33:02 +0000 (15:33 +0000)]
Merge "docs: Fixed option for "launchMode" within Android manifest doc." into mnc-io-docs
Tony Mak [Mon, 25 Jul 2016 10:39:34 +0000 (10:39 +0000)]
Merge \"Persist master volume mute across reboot\" into nyc-mr1-dev
am:
0df1d34e6e
Change-Id: I999fbc3df54108387b96bcc009c9bc8befb438c5
Tony Mak [Mon, 25 Jul 2016 10:39:25 +0000 (10:39 +0000)]
Persist master volume mute across reboot
am:
c1205111a9
Change-Id: Ia2badcd0fa06e8a8b74ffdfb26e525852d97cf07
Tony Mak [Mon, 25 Jul 2016 10:31:00 +0000 (10:31 +0000)]
Merge "Persist master volume mute across reboot" into nyc-mr1-dev
Sai Kiran Korwar [Mon, 25 Jul 2016 03:57:18 +0000 (03:57 +0000)]
Merge \\\"bootanimation: Call eglReleaseThread in threadLoop\\\" am:
189bbd9f6d am:
9495872add
am:
41ebe86049
Change-Id: I7927f23aa76cc17221e557d7f36b95bc23696a1b
Jesse Hall [Mon, 25 Jul 2016 03:53:11 +0000 (03:53 +0000)]
Merge \\"bootanimation: Call eglReleaseThread in threadLoop\\" am:
189bbd9f6d
am:
9495872add
Change-Id: Iaed82af8a48b84972b3b2336a1dc1299851a2f08
Sai Kiran Korwar [Mon, 25 Jul 2016 03:46:44 +0000 (03:46 +0000)]
Merge \"bootanimation: Call eglReleaseThread in threadLoop\"
am:
189bbd9f6d
Change-Id: Iaa5b3e60548ee2cce19cb4c31a6274d0ad877189
Jesse Hall [Mon, 25 Jul 2016 03:36:57 +0000 (03:36 +0000)]
Merge "bootanimation: Call eglReleaseThread in threadLoop"
Jaewan Kim [Mon, 25 Jul 2016 00:58:42 +0000 (00:58 +0000)]
Merge \"PIP: Handle layoutDirection changes\" into nyc-mr1-dev
am:
715e07a356
Change-Id: Ic37ec7762a49e4a59c9e699add5d1f5a7c7a8a3e
Jaewan Kim [Mon, 25 Jul 2016 00:58:34 +0000 (00:58 +0000)]
PIP: Handle layoutDirection changes
am:
73ef3516d2
Change-Id: I75b84d9f142f17f4fa19492f668dd3bb302c43cf
Jaewan Kim [Mon, 25 Jul 2016 00:53:51 +0000 (00:53 +0000)]
Merge "PIP: Handle layoutDirection changes" into nyc-mr1-dev
Dan Sandler [Sun, 24 Jul 2016 21:30:28 +0000 (21:30 +0000)]
Fix crash for some seed values.
am:
7c2e730f63
Change-Id: Ia755c65d5d47b907eea46df4dff356ccc13a3e66
Dan Sandler [Sun, 24 Jul 2016 21:30:23 +0000 (21:30 +0000)]
Use a compressed Icon for the notification\'s largeIcon.
am:
1e52909888
Change-Id: I59840e77f69621f6352fe6aacc85ea71a0679ca4
Dan Sandler [Sun, 24 Jul 2016 21:30:18 +0000 (21:30 +0000)]
Grooming the cats.
am:
4a1bcd966b
Change-Id: I03ff25c66d45afc60d300ffa93b628a2ef608c82
Dan Sandler [Sat, 16 Jul 2016 05:25:31 +0000 (01:25 -0400)]
Fix crash for some seed values.
Change-Id: I2f8d0a388a1bfdd4d3111abce7e4bcafe1e9bf3d
Fixes:
30169383
Dan Sandler [Sat, 16 Jul 2016 05:01:19 +0000 (01:01 -0400)]
Use a compressed Icon for the notification's largeIcon.
Fixes:
29918548
Change-Id: I2f70011221c7ec96aab8e540cd0213660282b49c
Dan Sandler [Sat, 16 Jul 2016 04:39:21 +0000 (00:39 -0400)]
Grooming the cats.
- Closed up tiny gaps in the vectors
- Export larger cat PNGs
- Make it harder to delete cats by accident
- Properly color the two front/back feet most of the time
instead of the two left/right
Change-Id: I185bf433d3be004945d6e16387ec928c14376b7a
Fixes:
29922607
Fixes:
30064123
Fixes:
29922111
Fixes:
29922066
Jorim Jaggi [Fri, 22 Jul 2016 22:59:10 +0000 (22:59 +0000)]
Merge \"Move SysUI to top app scheduling if panel expanded\" into nyc-mr1-dev
am:
adc51e460c
Change-Id: I89bc6612e18d0e298d95ed6777d95067c3a9d8c4
Jorim Jaggi [Fri, 22 Jul 2016 22:59:06 +0000 (22:59 +0000)]
Move SysUI to top app scheduling if panel expanded
am:
f6782ee1c8
Change-Id: I61d0afe8669a5d1155425883e79fe756abed7c58
Daniel Chapin [Fri, 22 Jul 2016 22:49:36 +0000 (22:49 +0000)]
Merge "Move SysUI to top app scheduling if panel expanded" into nyc-mr1-dev
Justin Klaassen [Fri, 22 Jul 2016 22:13:30 +0000 (22:13 +0000)]
Merge \"Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS\" into nyc-mr1-dev
am:
c8c60f5930
Change-Id: Idea9e5fdc4b54cb287ce1d82fdac75ef4bb95750
Justin Klaassen [Fri, 22 Jul 2016 22:13:23 +0000 (22:13 +0000)]
Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS
am:
06c0cb7acd
Change-Id: I7ea6ce28be43d519144ec9311e15334d35e2702f
Jorim Jaggi [Fri, 22 Jul 2016 09:40:00 +0000 (11:40 +0200)]
Move SysUI to top app scheduling if panel expanded
Also fixes a bug which didn't set the correct renderThreadTid
when restarting an app (for example, when SystemUI gets killed).
Bug:
30292998
Change-Id: I420bee8a11d430b1e52ded050536e56a85a48800
Justin Klaassen [Fri, 22 Jul 2016 21:55:58 +0000 (21:55 +0000)]
Merge "Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into nyc-mr1-dev
Eino-Ville Talvala [Fri, 22 Jul 2016 21:53:00 +0000 (21:53 +0000)]
Merge \"ImageReader: Add discardFreeBuffers method\" into nyc-mr1-dev
am:
b417eb176f
Change-Id: I599785ee3e6d4ae576b5897ff0f62303c1746a79
Eino-Ville Talvala [Fri, 22 Jul 2016 21:52:51 +0000 (21:52 +0000)]
ImageReader: Add discardFreeBuffers method
am:
2e2aaf6e04
Change-Id: I142f1b011a045aa0f5af7c33eb76b059eb67e30d
Eino-Ville Talvala [Fri, 22 Jul 2016 21:42:36 +0000 (21:42 +0000)]
Merge "ImageReader: Add discardFreeBuffers method" into nyc-mr1-dev
Alan Viverette [Fri, 22 Jul 2016 21:18:48 +0000 (21:18 +0000)]
Merge \"Ensure forwarding listener target is long-clickable\" into nyc-mr1-dev
am:
48c5f38b34
Change-Id: I40fd45addb421ea8e817f5e48e18f1d4286c9917
Alan Viverette [Fri, 22 Jul 2016 21:18:43 +0000 (21:18 +0000)]
Ensure forwarding listener target is long-clickable
am:
11ace9eedb
Change-Id: I182f933b35aef0da062bf6e7d4c485d681d50258
Alan Viverette [Fri, 22 Jul 2016 21:09:35 +0000 (21:09 +0000)]
Merge "Ensure forwarding listener target is long-clickable" into nyc-mr1-dev
Chet Haase [Fri, 22 Jul 2016 20:52:34 +0000 (20:52 +0000)]
Merge \"Fix NPE in JobPackageTracker\" into nyc-mr1-dev
am:
12fae936db
Change-Id: If4dde3752f6ddb268dc5ca2b9ce81e5e82fccb89
Chet Haase [Fri, 22 Jul 2016 20:52:30 +0000 (20:52 +0000)]
Fix NPE in JobPackageTracker
am:
86b300c374
Change-Id: Ifd67d6595bf7b7f677270be5516612267587884d
Chet Haase [Fri, 22 Jul 2016 20:45:49 +0000 (20:45 +0000)]
Merge "Fix NPE in JobPackageTracker" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 22 Jul 2016 20:42:12 +0000 (20:42 +0000)]
Merge changes I916c680d,I55e7c86c into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Fix intent flags\" into nyc-mr1-dev am:
85e086248d
Fix intent flags am:
7e5c3e8542
Android Build Merger (Role) [Fri, 22 Jul 2016 20:41:52 +0000 (20:41 +0000)]
Merge "docs: Updated support library revision history for 24.1.1 am:
0b80531b5b am:
6a2782548d am:
659f6f7017" into nyc-mr1-dev-plus-aosp
Makoto Onuki [Fri, 22 Jul 2016 20:41:17 +0000 (20:41 +0000)]
Merge \"Fix intent flags\" into nyc-mr1-dev
am:
85e086248d
Change-Id: I916c680de263edaa7422b5c82da428b161de1338
Makoto Onuki [Fri, 22 Jul 2016 20:41:13 +0000 (20:41 +0000)]
Fix intent flags
am:
7e5c3e8542
Change-Id: I55e7c86c3bcd421b04c8ddb4c2734833fb8b3585
Andrew Solovay [Fri, 22 Jul 2016 20:41:08 +0000 (20:41 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b am:
6a2782548d
am:
659f6f7017
Change-Id: Ie3a15507ebf04bf3f92cd6b35f2b2dfa99bc0a08
Andrew Solovay [Fri, 22 Jul 2016 20:40:52 +0000 (20:40 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b am:
6a2782548d
am:
03453b98d8
Change-Id: I9ad2ca0e97ef89f181b2f61cbcd4dad4a286d798
TreeHugger Robot [Fri, 22 Jul 2016 20:34:43 +0000 (20:34 +0000)]
Merge "Fix intent flags" into nyc-mr1-dev
Eric Laurent [Fri, 22 Jul 2016 20:33:37 +0000 (20:33 +0000)]
Merge \"bootanimation: fix glitchy playback\" into nyc-mr1-dev
am:
acf0e702f2
Change-Id: I4065891467fe4b37bf1968f8e54ccedba713813b
Eric Laurent [Fri, 22 Jul 2016 20:33:34 +0000 (20:33 +0000)]
bootanimation: fix glitchy playback
am:
197e47979a
Change-Id: Idbde31bfa48916f829bc3a1f934bd894c3303fcc
Andrew Solovay [Fri, 22 Jul 2016 20:30:08 +0000 (20:30 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b
am:
6a2782548d
Change-Id: I14ce3e45b87eef0401d4429e26f7b2a7af96343f
Andrew Solovay [Fri, 22 Jul 2016 20:30:01 +0000 (20:30 +0000)]
docs: Updated support library revision history for 24.1.1 am:
0b80531b5b
am:
6a2782548d
Change-Id: Id4496ca42ca6d3d9989bbbee2a71b01af23086a0
Eric Laurent [Fri, 22 Jul 2016 20:23:56 +0000 (20:23 +0000)]
Merge "bootanimation: fix glitchy playback" into nyc-mr1-dev
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
Andrew Solovay [Fri, 22 Jul 2016 20:14:57 +0000 (20:14 +0000)]
docs: Updated support library revision history for 24.1.1
am:
0b80531b5b
Change-Id: I26c19728affe538d49282d9966fa5d87e55ba076
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
Makoto Onuki [Fri, 22 Jul 2016 18:57:05 +0000 (11:57 -0700)]
Fix intent flags
Bug
30307198
Change-Id: If127001320dcabdc53ee73860dbb9983cb25b611
Andrew Solovay [Fri, 22 Jul 2016 18:35:04 +0000 (11:35 -0700)]
docs: Updated support library revision history for 24.1.1
See first comment for doc stage location.
bug:
30302654
Change-Id: Icb9a171963b6bf7feec69b6dd36aa6513055bb05
Eric Laurent [Fri, 22 Jul 2016 01:17:15 +0000 (18:17 -0700)]
bootanimation: fix glitchy playback
Do not use low latency playback mode to be more
robust against scheduling problems during boot phase.
Also:
- remove unused reverb on output mix
- fix WAV file parser.
Bug:
30277818
Change-Id: I1e15d3003a25c93d4995006885b32a754d17343f
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
Tony Mak [Fri, 22 Jul 2016 15:02:59 +0000 (16:02 +0100)]
Persist master volume mute across reboot
Fix:
30133263
Change-Id: I53450a504e40e55516acc88550f369a74a244eaf
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
OSDN Git Service
