git.osdn.net Git - android-x86/frameworks-base.git/log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Fri, 22 Jul 2016 20:41:13 +0000 (20:41 +0000)]

Fix intent flags
am: 7e5c3e8542

Change-Id: I55e7c86c3bcd421b04c8ddb4c2734833fb8b3585

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 22 Jul 2016 20:34:43 +0000 (20:34 +0000)]

Merge "Fix intent flags" into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Laurent [Fri, 22 Jul 2016 20:33:34 +0000 (20:33 +0000)]

bootanimation: fix glitchy playback
am: 197e47979a

Change-Id: Idbde31bfa48916f829bc3a1f934bd894c3303fcc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Laurent [Fri, 22 Jul 2016 20:23:56 +0000 (20:23 +0000)]

Merge "bootanimation: fix glitchy playback" into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Fri, 22 Jul 2016 18:57:05 +0000 (11:57 -0700)]

Fix intent flags

Bug 30307198

Change-Id: If127001320dcabdc53ee73860dbb9983cb25b611

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Adrian Roos [Fri, 22 Jul 2016 17:17:18 +0000 (17:17 +0000)]

ServiceConnection: Properly serialize events
am: a9b43182c6

Change-Id: I3571754de4d659aaf6b4a61fa14ae8256ca29f7a

commit | commitdiff | tree

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

commit | commitdiff | tree

Adrian Roos [Fri, 22 Jul 2016 17:03:42 +0000 (17:03 +0000)]

Merge "ServiceConnection: Properly serialize events" into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dan Sandler [Fri, 22 Jul 2016 04:45:28 +0000 (04:45 +0000)]

Decrease default longpress timeout to 400ms.
am: 71f85e9194

Change-Id: I0daedfc5d6d2c0b98feda11f1930eaf3fdca7e76

commit | commitdiff | tree

Daniel Sandler [Fri, 22 Jul 2016 04:41:28 +0000 (04:41 +0000)]

Merge "Decrease default longpress timeout to 400ms." into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Viverette [Fri, 22 Jul 2016 03:02:39 +0000 (03:02 +0000)]

Better docs for ImageView legacy tint
am: 2b4e14cfcc

Change-Id: I72f67ee9c67501ba9ea827f0068186673f59d852

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Fri, 22 Jul 2016 03:02:30 +0000 (03:02 +0000)]

Fix realCallingUid/Pid for startActivities()
am: d67b187dcc

Change-Id: Id782c18b4c7c9bb0067553620f008eeafed26356

commit | commitdiff | tree

Alan Viverette [Fri, 22 Jul 2016 02:50:38 +0000 (02:50 +0000)]

Merge "Better docs for ImageView legacy tint" into nyc-mr1-dev

commit | commitdiff | tree

Makoto Onuki [Fri, 22 Jul 2016 02:49:11 +0000 (02:49 +0000)]

Merge "Fix realCallingUid/Pid for startActivities()" into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Todd Kennedy [Fri, 22 Jul 2016 02:28:07 +0000 (02:28 +0000)]

use printwriter instead of stdout
am: b6e96e52e3

Change-Id: I8c228e916578a6e3bb5b38f95bacc1aa21d7b5ad

commit | commitdiff | tree

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

commit | commitdiff | tree

Todd Kennedy [Fri, 22 Jul 2016 02:27:43 +0000 (02:27 +0000)]

Skip failed package installs
am: 6341244856

Change-Id: I1a937e6a2196981bc6d0aa8dd5b2cf1dbbd88648

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Fri, 22 Jul 2016 02:27:22 +0000 (02:27 +0000)]

Unit tests for \"cmd shortcut\"
am: 0b9d1db5c1

Change-Id: I7461b7b5427a8c597bf5b3903c66a98a3dca25f8

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Adam Powell [Fri, 22 Jul 2016 02:24:09 +0000 (02:24 +0000)]

Add View reveal on focus hint
am: 7ec3fb3947

Change-Id: Id3af05b3040821a94e3fd694d761fd317568fa5a

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Fri, 22 Jul 2016 02:24:00 +0000 (02:24 +0000)]

Follow-up to multiple intents support
am: 0eed441c0c

Change-Id: I3007735db610ddd8c608290ffac8edcdcf390758

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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