John Spurlock
eac6926f0c
am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
...
* commit '260e6d542ff05094063f1a1574f41fa165308eef':
Don't play hint animations when dozing
2014-10-01 15:14:30 +00:00
Jason Monk
9e280c447f
am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev
...
* commit '15349991240bb9443d704b4ac85915f474e5108c':
Pull roaming from mServiceState for consistency
2014-10-01 15:14:26 +00:00
George Mount
6d7a0cd57f
am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev
...
* commit '3dc0a918748fade0ad7c683c6bc769f032759fcd':
Clear preordered list after use.
2014-10-01 15:14:22 +00:00
John Spurlock
3fd4440fea
am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging.
...
* commit 'af41d8477a8152c0597630066207a863ad74614e':
Doze: Log screenOnFromTouch when flinging.
2014-10-01 15:14:18 +00:00
John Spurlock
260e6d542f
am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
...
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
Don't play hint animations when dozing
2014-10-01 14:59:07 +00:00
Jason Monk
1534999124
am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev
...
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
Pull roaming from mServiceState for consistency
2014-10-01 14:58:57 +00:00
George Mount
3dc0a91874
am 8afceda1: Merge "Clear preordered list after use." into lmp-dev
...
* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
Clear preordered list after use.
2014-10-01 14:58:53 +00:00
John Spurlock
af41d8477a
am ee98df79: Doze: Log screenOnFromTouch when flinging.
...
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
Doze: Log screenOnFromTouch when flinging.
2014-10-01 14:58:45 +00:00
Baligh Uddin
3e9bf6c693
am 3022aa21: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '3022aa2175e82cc67c51a70748ea6923876e9806':
Import translations. DO NOT MERGE
2014-10-01 05:31:30 +00:00
Baligh Uddin
2e459a6653
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-01 04:25:39 +00:00
Baligh Uddin
3022aa2175
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-01 04:25:35 +00:00
Matthew Williams
9a957e0904
am d55d3c59: am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev
...
* commit 'd55d3c597a889ec1ac5b0fc1248a605fc49f5d38':
Fix deadlock caused by clearAllBackoffs in SSE
2014-10-01 00:59:20 +00:00
Lorenzo Colitti
5e7f08f513
am 6c1d0e07: am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
...
* commit '6c1d0e07840d124921fd30f04ad11b409ea73b3e':
Update LegacyTypeTracker state before sending connect broadcasts.
2014-10-01 00:59:16 +00:00
Scott Rowe
a0bdf9cce7
am 8cfba205: am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
* commit '8cfba20560314a09d7e9a2fd98355109d30d57cd':
docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-10-01 00:59:13 +00:00
Ricardo Cervera
ba32c278da
am d4a2da04: am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
...
* commit 'd4a2da0494f4a3d2636f7e61c36373f872039262':
docs: Fixed path for build output.
2014-10-01 00:59:09 +00:00
Justin Koh
870ba83b3d
am 8dd8818b: am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
...
* commit '8dd8818bdeb7b264f82da0f0854722ffd7ab7e12':
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
2014-10-01 00:59:06 +00:00
Alan Viverette
a1411fe08f
am 52208590: am 76e15c4b: Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev
...
* commit '52208590123210506abd2d14124bec1f07847b1f':
Decrease date picker height to avoid cutting off calendar
2014-10-01 00:59:02 +00:00
Alan Viverette
eca52d9171
am 35ebdd05: am b805da9b: Merge "Fix drawable container tinting" into lmp-dev
...
* commit '35ebdd0514c7d3e6b2e64acb916f5160821bd463':
Fix drawable container tinting
2014-10-01 00:58:59 +00:00
Jean-Michel Trivi
9f1bca5f21
am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev
...
* commit '0ed179d185bc976779c6959b4d2d11c19538e60b':
Send volume keys to the default stream if not actually playing
2014-10-01 00:58:55 +00:00
Dianne Hackborn
e26ba8f74f
am 069de204: am 38646c19: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '069de2045ef1b65f8952e2a452afbfa6bdc3f850':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-10-01 00:58:52 +00:00
Chris Craik
d7de7b49b1
am 505c9d2c: am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev
...
* commit '505c9d2ce0a8ed8dc27baf406f05f2ae4c265fe5':
Implement alpha as documented for drawables
2014-10-01 00:58:48 +00:00
Fabrice Di Meglio
b90269b095
am b08fc7ec: am df61d004: Fix bug #17682629 Crash while accessing apps\' settings
...
* commit 'b08fc7ec1b77203d53766a1537239e30fc56890f':
Fix bug #17682629 Crash while accessing apps' settings
2014-10-01 00:58:45 +00:00
Matthew Williams
d55d3c597a
am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev
...
* commit 'bc156ba430d286aaab8deb7bbb3bccc655cd2e92':
Fix deadlock caused by clearAllBackoffs in SSE
2014-10-01 00:52:38 +00:00
Lorenzo Colitti
6c1d0e0784
am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
...
* commit 'd8f7e048281559462f9c590f9d7d48fb7fe065ce':
Update LegacyTypeTracker state before sending connect broadcasts.
2014-10-01 00:52:34 +00:00
Scott Rowe
8cfba20560
am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown
...
* commit 'd1462247e05dab10d20372249e9a3ef7ef93fc2e':
docs: b/16044763 Update IAB docs to give notice of v2 turndown
2014-10-01 00:52:07 +00:00
Ricardo Cervera
d4a2da0494
am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
...
* commit '3910b5d2f55b613191610905a4ae25aa3d3a1d15':
docs: Fixed path for build output.
2014-10-01 00:52:04 +00:00
Justin Koh
8dd8818bde
am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
...
* commit '91bd87699137a4ec9f4dc249592401005303f945':
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
2014-10-01 00:52:00 +00:00
Alan Viverette
5220859012
am 76e15c4b: Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev
...
* commit '76e15c4b3affbca016f6ecc3dbf302db9b64bbe4':
Decrease date picker height to avoid cutting off calendar
2014-10-01 00:51:57 +00:00
Alan Viverette
35ebdd0514
am b805da9b: Merge "Fix drawable container tinting" into lmp-dev
...
* commit 'b805da9b592e67cb777b78db3a96d47c60e31ca7':
Fix drawable container tinting
2014-10-01 00:51:37 +00:00
Jean-Michel Trivi
0ed179d185
am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev
...
* commit '4a154af9aad13c09821ada6187440feaec2d38e8':
Send volume keys to the default stream if not actually playing
2014-10-01 00:51:32 +00:00
Dianne Hackborn
069de2045e
am 38646c19: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-10-01 00:51:10 +00:00
Chris Craik
505c9d2ce0
am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev
...
* commit 'e910cc88387f49b119bb2f8e579849864970ac87':
Implement alpha as documented for drawables
2014-10-01 00:50:59 +00:00
Fabrice Di Meglio
b08fc7ec1b
am df61d004: Fix bug #17682629 Crash while accessing apps\' settings
...
* commit 'df61d0046cb901f75d2758aa443190371b4cc746':
Fix bug #17682629 Crash while accessing apps' settings
2014-10-01 00:50:56 +00:00
Chris Craik
0889780674
Merge "Add tracing for saveLayer" into lmp-mr1-dev
2014-09-30 23:06:43 +00:00
Wink Saville
fdadab4b5a
Merge "Fix concurrent access violation." into lmp-mr1-dev
2014-09-30 22:30:05 +00:00
Etan Cohen
a33cf075fa
Fix concurrent access violation.
...
Change-Id: I8586629cafe585135f0f72ba011b65f81242fc22
2014-09-30 22:23:49 +00:00
RoboErik
80aa626e04
am a65a4f64: am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev
...
* commit 'a65a4f64e6206c370bce79d74753f6f67bc4b4e0':
Be more paranoid about threading in MediaSessionRecord
2014-09-30 16:43:43 +00:00
John Spurlock
a1b84165f9
Merge "Don't play hint animations when dozing" into lmp-dev
2014-09-30 16:35:26 +00:00
RoboErik
a65a4f64e6
am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev
...
* commit '9eef5bf8d1a69879ada3176c839676dc82b14daf':
Be more paranoid about threading in MediaSessionRecord
2014-09-30 16:32:03 +00:00
Jorim Jaggi
d7912d2f10
Don't play hint animations when dozing
...
Bug: 17718416
Change-Id: I2c27b4ea479ee46612eb5284a2c872d03dc52ab0
2014-09-30 17:38:19 +02:00
Jason Monk
e7b18d2bab
Merge "Pull roaming from mServiceState for consistency" into lmp-dev
2014-09-30 15:30:11 +00:00
George Mount
8afceda141
Merge "Clear preordered list after use." into lmp-dev
2014-09-30 14:58:21 +00:00
Derek Sollenberger
345effc2b2
Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-mr1-dev
2014-09-30 14:34:58 +00:00
John Spurlock
ee98df79a1
Doze: Log screenOnFromTouch when flinging.
...
Bug: 17350239
Bug: 17496795
Change-Id: I4a8e26c2fc05cf4396e9c8cb58e81b4f95c531e6
2014-09-30 14:07:23 +00:00
Jason Monk
1cd44e3ab4
Pull roaming from mServiceState for consistency
...
Also consolidate roaming logic while here, to make it easier to
maintain.
Bug: 17514906
Bug: 17619763
Change-Id: I8efabdecc26722ff6ac70d715f3befaae989abdc
2014-09-30 10:05:46 -04:00
Baligh Uddin
434e3f5692
Import translations. DO NOT MERGE
...
Change-Id: I7312c543254668cb3b572767fe94a3d8736b04f3
Auto-generated-cl: translation import
2014-09-30 01:20:57 -07:00
Baligh Uddin
38c6643e8e
Import translations. DO NOT MERGE
...
Change-Id: Iab979f7e50308c63085496805282145f2788489c
Auto-generated-cl: translation import
2014-09-30 01:00:26 -07:00
Jungshik Jang
8dff369838
Merge "Update CEC keycode repeat status." into lmp-mr1-dev
2014-09-30 04:47:56 +00:00
Matthew Williams
bc156ba430
Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev
2014-09-30 03:09:10 +00:00
Lorenzo Colitti
d8f7e04828
Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
2014-09-30 03:05:49 +00:00