Deepanshu Gupta
09642b89aa
am 87cc1376: (-s ours) am ae89467a: am 5cf13384: am 8b564008: am 90f23349: am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit '87cc1376ec4c175b4442b038cec56e70ee125166':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 21:02:48 +00:00
Justin Koh
7348d1d7c5
am 1c697552: (-s ours) am 0b6aea07: am c04db461: am ac32ca7e: am c4e233e6: am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
...
* commit '1c697552b63502d8ca3faaa49e82ba2bfa3961ed':
Revert "DO NOT MERGE Fix race condition between binder deaths"
2014-09-26 21:02:44 +00:00
Craig Mautner
a2338c6265
am 60b0bb3a: (-s ours) am 4d66c8a7: am 4e5de862: am 45919a43: am 0d604359: am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths
...
* commit '60b0bb3a21e0711385efe55edd61d2b694427adb':
DO NOT MERGE Fix race condition between binder deaths
2014-09-26 21:02:39 +00:00
Deepanshu Gupta
d83a084c8b
am df062b63: (-s ours) am aafc6835: am 06e681d3: am 55ee2bbb: am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit 'df062b63e263a9cd1c67ab5c2d2242687374a401':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 21:02:35 +00:00
Deepanshu Gupta
58ad97ed25
am abdf2e45: (-s ours) am 97ac144f: am 40f57783: am dd06bba1: am fdf5fe8f: am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit 'abdf2e45beae27f4b63e8bc69662a2235dce7aeb':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 21:02:30 +00:00
Deepanshu Gupta
8563829875
am ae89467a: am 5cf13384: am 8b564008: am 90f23349: am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit 'ae89467a070303a34928e6a52afef731f6e8ffac':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 20:51:49 +00:00
Justin Koh
3b26988951
am 0b6aea07: am c04db461: am ac32ca7e: am c4e233e6: am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
...
* commit '0b6aea078df3108850c3e25fd343fb2f8e3597cf':
Revert "DO NOT MERGE Fix race condition between binder deaths"
2014-09-26 20:51:46 +00:00
Craig Mautner
7c680250f6
am 4d66c8a7: am 4e5de862: am 45919a43: am 0d604359: am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths
...
* commit '4d66c8a7bbae9445f41be6e4e1499334b4396b1d':
DO NOT MERGE Fix race condition between binder deaths
2014-09-26 20:51:42 +00:00
Deepanshu Gupta
e70c2a9f2f
am aafc6835: am 06e681d3: am 55ee2bbb: am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit 'aafc6835c2d00cc7f87197bddbb9294a305940fa':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 20:51:38 +00:00
Deepanshu Gupta
ac244b1703
am 97ac144f: am 40f57783: am dd06bba1: am fdf5fe8f: am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit '97ac144fc01b0085eb4a3b335577177ca6ab549c':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 20:51:33 +00:00
Deepanshu Gupta
62c14032a8
am 5cf13384: am 8b564008: am 90f23349: am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit '5cf13384745ca4d8cbec98ce1b5c75006149f0dc':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 20:43:46 +00:00
Justin Koh
ddb4384f12
am c04db461: am ac32ca7e: am c4e233e6: am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
...
* commit 'c04db461a305f35158ea5f3a01b300b9c72ee7af':
Revert "DO NOT MERGE Fix race condition between binder deaths"
2014-09-26 20:43:42 +00:00
Craig Mautner
8b63fb4a9f
am 4e5de862: am 45919a43: am 0d604359: am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths
...
* commit '4e5de8620e7a25a4e424d3e2bbe7f0a05f7cbd5d':
DO NOT MERGE Fix race condition between binder deaths
2014-09-26 20:43:38 +00:00
Deepanshu Gupta
37a01e03d0
am 06e681d3: am 55ee2bbb: am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit '06e681d3f75b0928b0a813199b69febf54d72ba5':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 20:43:34 +00:00
Deepanshu Gupta
f9cf3dc53e
am 40f57783: am dd06bba1: am fdf5fe8f: am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit '40f577836a3ba17e8e4186c1f5be335a504b9b35':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 20:43:30 +00:00
Deepanshu Gupta
7e664b0b30
am 8b564008: am 90f23349: am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit '8b56400834887a39a9e8d04f0b21a424a194986f':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 19:46:52 +00:00
Justin Koh
421b4de3fb
am ac32ca7e: am c4e233e6: am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
...
* commit 'ac32ca7e0cc54b1b2a46e6fe404a60a61abd86bd':
Revert "DO NOT MERGE Fix race condition between binder deaths"
2014-09-26 19:46:49 +00:00
Craig Mautner
fb5d979462
am 45919a43: am 0d604359: am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths
...
* commit '45919a431ec2433971b0bb3e118e307f07f6dcf0':
DO NOT MERGE Fix race condition between binder deaths
2014-09-26 19:46:45 +00:00
Deepanshu Gupta
340a09688e
am 55ee2bbb: am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit '55ee2bbb97a35b92d610d12c2c58e6741d831c3e':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 19:46:42 +00:00
Deepanshu Gupta
27c40454dc
am dd06bba1: am fdf5fe8f: am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit 'dd06bba1a3936cb4a30bf7fc0775a4aa5485c1b9':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 19:46:39 +00:00
Yao Chen
babfa52acb
am 1fe66b74: am 1769e28d: am a4930277: am 000dd0f8: am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
...
* commit '1fe66b74b60921b15e8fd1125d4ad79cf65aef0e':
Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
2014-09-26 19:43:26 +00:00
Philip Nowell
3b726758f1
am f1234ed2: am ffb2a1f3: am e4b2bee4: am f8ecaacb: am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
...
* commit 'f1234ed20dcd1f77e5bd2e705f0516306403bc47':
Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
2014-09-26 19:43:21 +00:00
Deepanshu Gupta
20ae3641d1
am 90f23349: am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit '90f23349cd139aedd6e3029f71763d3e0ecde0f8':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:17:33 +00:00
Justin Koh
e618331ddf
am c4e233e6: am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
...
* commit 'c4e233e660db990b9b7759f274afda88d44bd036':
Revert "DO NOT MERGE Fix race condition between binder deaths"
2014-09-26 16:17:29 +00:00
Craig Mautner
1dfa7cb9d2
am 0d604359: am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths
...
* commit '0d604359272d89c7e984a9aff978cee89a9954c8':
DO NOT MERGE Fix race condition between binder deaths
2014-09-26 16:17:26 +00:00
Deepanshu Gupta
604445b0f8
am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit '7ef65757bf3ed611d66f07406d6df83983d791af':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:17:23 +00:00
Deepanshu Gupta
6d9b32f954
am fdf5fe8f: am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit 'fdf5fe8f1121770839b713be257dbc3cc41613e5':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:17:20 +00:00
Yao Chen
cc491cacf8
am 1769e28d: am a4930277: am 000dd0f8: am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
...
* commit '1769e28d34857bf78708c595e7ce71759aa961ea':
Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
2014-09-26 16:17:15 +00:00
Philip Nowell
5fec1ec61b
am ffb2a1f3: am e4b2bee4: am f8ecaacb: am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
...
* commit 'ffb2a1f3ae9b1942ac5c8164534b2e18bda68afc':
Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
2014-09-26 16:17:10 +00:00
Yao Chen
83f12a2514
am a4930277: am 000dd0f8: am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
...
* commit 'a49302777a963dd7dc184e4f1227f8c71ea3879c':
Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
2014-09-26 16:12:54 +00:00
Philip Nowell
0652f79541
am e4b2bee4: am f8ecaacb: am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
...
* commit 'e4b2bee477566ee142aabc719cb6a77eae812110':
Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
2014-09-26 16:12:50 +00:00
Deepanshu Gupta
23d43a0cc4
am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit 'a7045a43ca83d65134a54236ed0ead7751ee7377':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:11:38 +00:00
Justin Koh
c483a392ce
am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
...
* commit '1c487938c45317997389b9ad101fc6739e3fe847':
Revert "DO NOT MERGE Fix race condition between binder deaths"
2014-09-26 16:11:33 +00:00
Craig Mautner
66beed58c1
am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths
...
* commit '6ae7ea942fc89b1899da267253c5c78596ef5aa1':
DO NOT MERGE Fix race condition between binder deaths
2014-09-26 16:11:29 +00:00
Deepanshu Gupta
0a7d7ce140
am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit '9fcacf52d0277b0c0485638637ea357721f8c635':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:11:25 +00:00
Deepanshu Gupta
71c8349ba8
am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
...
* commit 'ac892f688f206eab746fac1bbe85c9f76657f8d6':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:11:19 +00:00
Yao Chen
ecb8ebc8bb
am 000dd0f8: am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
...
* commit '000dd0f8887ec32725cc8e9b44a8fe79543daf0d':
Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
2014-09-26 16:07:00 +00:00
Philip Nowell
6575738251
am f8ecaacb: am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
...
* commit 'f8ecaacbfd77cdb0b2aa1fb0918243691415c86e':
Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
2014-09-26 16:06:57 +00:00
Yao Chen
d611fc1083
am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
...
* commit '86d778155f077d5af10f43d0eb7b04584559e793':
Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
2014-09-26 16:02:28 +00:00
Yao Chen
08fccd0093
Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
2014-09-26 15:55:52 +00:00
Przemyslaw Szczepaniak
f0619add9e
am a2722441: am 32c73663: am e8b3a391: am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev
...
* commit 'a2722441c06902f7a9781b1928a6c5952b196da6':
Fix ambiguous TTS#playSilence method.
2014-09-26 15:29:22 +00:00
Sailesh Nepal
1c62b7b3a5
am 71e8654a: am 7043d948: am bdf84f29: Merge "Run update-api to fix build" into lmp-mr1-dev
...
* commit '71e8654a6c4877a428911f96ee6f67d6cdc302bb':
Run update-api to fix build
2014-09-26 15:29:11 +00:00
Svetoslav
9ba4f67663
am 1d64c0c9: am c9a230f4: am bcc4f1bc: am b14c7e04: am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev
...
* commit '1d64c0c98f23a7aff70cc5b388fdcc638abbf3e4':
Using wrong virtual view id When prefetching accessibility nodes.
2014-09-26 15:28:55 +00:00
John Spurlock
f62cd46d1e
am d031b964: am 25dbdb2f: am b66ad6c0: am 57dc3887: am cfc1a5ee: Merge "Shorten the zen supertoast visible duration." into lmp-dev
...
* commit 'd031b964b1f7e63e9fb25a2ae794e11198996c69':
Shorten the zen supertoast visible duration.
2014-09-26 15:28:50 +00:00
Dianne Hackborn
3a445f5888
am de04684d: am 941a19d2: am 265b2320: am c656d219: am 34b63d50: Merge "Fix issue #17574819 : Chrome browser process is killed..." into lmp-dev
...
* commit 'de04684ddc82290b593f52c196bbda4299671120':
Fix issue #17574819 : Chrome browser process is killed...
2014-09-26 15:28:42 +00:00
Jesse Hall
c6bee6e58b
am b32ce20e: am f295b675: am 9a2eafc1: am 12297705: am 7fa90f6a: Merge "bootanimation: allow animation to specify background color" into lmp-dev
...
* commit 'b32ce20e7e38893a4c2796159a638c5428138c17':
bootanimation: allow animation to specify background color
2014-09-26 15:28:37 +00:00
Svetoslav
b9a4f0d3d0
am 988af0c8: am c89120c5: am ab8e31e2: am 58be3b36: am 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev
...
* commit '988af0c8f9e4aaa98ed5ab751d24afd50b828095':
Invalid active window if temporary disabling accessibility for test tools.
2014-09-26 15:28:33 +00:00
Dianne Hackborn
b0e58ff6b3
am 534556ae: am 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '534556aef5ae22d522c5988d535b3b19b3742fd3':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-09-26 15:28:28 +00:00
Alan Viverette
8f0ad178cc
am 0610aa39: am 28a845c0: am 5bf925d9: am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
...
* commit '0610aa39c4a0344eb00193f2a501d599256e9107':
Correctly advertise accessibility scrolling actions
2014-09-26 15:28:22 +00:00
Sailesh Nepal
b40c692d58
am 234a4597: am 587e65b1: am 848718a0: am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev
...
* commit '234a45977925fdaf20aa7a3b333f551350049ae8':
Adding support for Cdma conference calling.
2014-09-26 15:28:17 +00:00