156103 Commits

Author SHA1 Message Date
Robert Ly
fbc0ac24a2 am f235c44c: am 8372379f: am 6641ddf6: am d00b110a: am e152b793: docs: remove fire and forget language from wear docs
* commit 'f235c44c842116db8c07a2cc6b2d943d9cd662c8':
  docs: remove fire and forget language from wear docs
2014-09-16 18:04:12 +00:00
Baligh Uddin
2e1ed8b1b9 am c3e3f159: (-s ours) am 131e89ee: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'c3e3f1594c01ded5d6c5440151b8dfd360055cec':
  Import translations. DO NOT MERGE
2014-09-16 18:03:19 +00:00
Baligh Uddin
87bd3c2379 am 60951a10: (-s ours) am 69e1dda0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '60951a107e24712b3132e1b85bca503b8f2ecb11':
  Import translations. DO NOT MERGE
2014-09-16 18:03:14 +00:00
Baligh Uddin
7449ac53e4 am 24530877: (-s ours) am 5e88c717: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '2453087742983b42e6dc1b0bc5876dbea2a45efc':
  Import translations. DO NOT MERGE
2014-09-16 18:03:09 +00:00
Martijn Coenen
1ab1452a35 am a31aeb6d: am cd108cbe: Merge "AID prefix registration." into lmp-dev
* commit 'a31aeb6da916e1bc22b25d9ec6940b7cde24ec2f':
  AID prefix registration.
2014-09-16 18:02:43 +00:00
John Spurlock
b6b01c0b1e am 30bd1e19: am 2a65f8a6: Doze: Workaround vibration-related pickup gestures.
* commit '30bd1e1987aa62db0d2b0328ef6b7ae22c71b31e':
  Doze: Workaround vibration-related pickup gestures.
2014-09-16 18:02:34 +00:00
Robert Ly
15db05c91d am 8372379f: am 6641ddf6: am d00b110a: am e152b793: docs: remove fire and forget language from wear docs
* commit '8372379f5cb6b5f828093a5006d785026af764ad':
  docs: remove fire and forget language from wear docs
2014-09-16 16:35:39 +00:00
Robert Ly
b84b1058d0 am 6641ddf6: am d00b110a: am e152b793: docs: remove fire and forget language from wear docs
* commit '6641ddf6711a7f521df6492db167598ec33d2487':
  docs: remove fire and forget language from wear docs
2014-09-16 16:24:17 +00:00
Baligh Uddin
c23f8990a9 am 131e89ee: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '131e89ee2bcf17d3d7ddc08f01355f1965be0f8f':
  Import translations. DO NOT MERGE
2014-09-16 15:26:40 +00:00
Baligh Uddin
e252c2765c am 69e1dda0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '69e1dda05581da0e45b16fe2af8f93a2203eb556':
  Import translations. DO NOT MERGE
2014-09-16 15:26:36 +00:00
Baligh Uddin
9a575c7d87 am 5e88c717: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '5e88c71754e40e1775b58c4a561c08673a082534':
  Import translations. DO NOT MERGE
2014-09-16 15:26:31 +00:00
Baligh Uddin
9206c09dca Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:18:24 +00:00
Baligh Uddin
2356487b45 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:17:08 +00:00
Baligh Uddin
71cb3a44c1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-16 15:16:40 +00:00
Martijn Coenen
cee69638fa am cd108cbe: Merge "AID prefix registration." into lmp-dev
* commit 'cd108cbe643d824437e8a629aa258a62ad237b39':
  AID prefix registration.
2014-09-16 15:07:07 +00:00
Martijn Coenen
7e25a504d4 Merge "AID prefix registration." into lmp-dev 2014-09-16 14:55:04 +00:00
John Spurlock
ff56c0ee6b am 2a65f8a6: Doze: Workaround vibration-related pickup gestures.
* commit '2a65f8a6dd58b503aad3de0f7374e50f84fe1a3a':
  Doze: Workaround vibration-related pickup gestures.
2014-09-16 14:15:26 +00:00
John Spurlock
50a8ea6ec2 Doze: Workaround vibration-related pickup gestures.
Ensure the pickup is registered a safe period of time after the
last notification before resetting the notification pulse schedule.

Bug:17496795
Change-Id: I0edc9bcbdf078cbf55df5935744a3eee7e902b5d
2014-09-16 09:12:03 -04:00
Yuncheol Heo
44ed50977a am ddf679ec: am 5c0d3862: Merge "Make the playback device pass CEC CTS." into lmp-dev
* commit 'ddf679ec762d78b6a487a9d72747d060ab09c505':
  Make the playback device pass CEC CTS.
2014-09-16 09:00:17 +00:00
Svetoslav
f0073bb800 am 88025747: am 42f75e9f: Merge "Missing or wrong pages in preview when scorlling large docs." into lmp-dev
* commit '8802574776cd5c5f94c771c02dfdbf62b0fa79b3':
  Missing or wrong pages in preview when scorlling large docs.
2014-09-16 09:00:12 +00:00
Tsuwei Chen
108dee2b37 am 85e7eafb: am 86f1d252: Merge "Set user agent for XTRA download according to carrier specification. Bug: 17056380 Change-Id: Iacb90d4780f35fa6875702889d4a5f02610768b7" into lmp-dev
* commit '85e7eafb787bf5e949bebf4f60b4c83042a03002':
  Set user agent for XTRA download according to carrier specification. Bug: 17056380 Change-Id: Iacb90d4780f35fa6875702889d4a5f02610768b7
2014-09-16 09:00:06 +00:00
Svetoslav
74d640aa14 am 94e2d608: am 9208a81b: Merge "Page shredder callback invoked on the wrong thread." into lmp-dev
* commit '94e2d6089d02a2daa8a40069f8d355b6c8d05703':
  Page shredder callback invoked on the wrong thread.
2014-09-16 09:00:01 +00:00
Svetoslav
fc0a785e96 am ec88fbf7: am c59be126: Merge "Update print preview when a printer becomes available" into lmp-dev
* commit 'ec88fbf769c8d9d1752e37f584f9970456c7d53b':
  Update print preview when a printer becomes available
2014-09-16 08:59:56 +00:00
Jungshik Jang
dc43da31f0 am a7287581: am 8904a3c6: Merge "Fix volume change failure in HDMI-CEC system audio mode." into lmp-dev
* commit 'a728758197709344727453473b984195ff0e1f8f':
  Fix volume change failure in HDMI-CEC system audio mode.
2014-09-16 08:59:50 +00:00
Dianne Hackborn
7ac65e0498 am 02c038e0: am 9f568025: Merge "Quick fix issue #17514851: dumpsys package <package-name> includes..." into lmp-dev
* commit '02c038e0de47ff7184ad1466a14f77da85eb975b':
  Quick fix issue #17514851: dumpsys package <package-name> includes...
2014-09-16 08:59:45 +00:00
Edward Jee
cbf76135e0 am 8a20c56f: am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev
* commit '8a20c56fe0011b8a5ba11e39e734679f89be3f3d':
  Adds APIs for Bluetooth PBAP and MAP access permission.
2014-09-16 08:59:40 +00:00
Igor Murashkin
4280c893bf am da839237: am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev
* commit 'da839237d71b97dcd789e54031497da39361698a':
  camera2-legacy: Fix jpeg thumbnail quality not being set
2014-09-16 08:59:34 +00:00
Adam Lesinski
2958c016a1 am 3b36b8c7: am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev
* commit '3b36b8c7d91dc8793429491617c645c1aafc4d49':
  Show the lockscreen when more than 1 user is present
2014-09-16 08:59:29 +00:00
Eino-Ville Talvala
810d34a4a1 am c142ac27: am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev
* commit 'c142ac272ab02d85edf07ad7da79006c33c3b613':
  Camera2: Check for sequence complete sooner.
2014-09-16 08:59:24 +00:00
Alan Viverette
1454fe9553 am 56fbc575: am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev
* commit '56fbc5751bd2da6227c03372f3d90ab4c7333f22':
  Always apply ImageView's tint attribute using SRC_ATOP by default
2014-09-16 08:59:18 +00:00
Alan Viverette
e45ed5e85f am a96b8ea7: am 6a750aa9: Merge "Reduce overdraw after clearing ripples in RippleDrawable" into lmp-dev
* commit 'a96b8ea7fe489965b7381b59169dd20fd46d334c':
  Reduce overdraw after clearing ripples in RippleDrawable
2014-09-16 08:59:13 +00:00
Yohei Yukawa
abe0c395f9 am 5a2efd42: am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev
* commit '5a2efd42d8d0b1c52f628b8e727d3c99b068ae96':
  Minimize the number of default enabled IMEs part 3
2014-09-16 08:59:08 +00:00
Ang Li
e2291d9763 am 94325a15: am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev
* commit '94325a15c53e252b10c75e4c197858d028f4a37b':
  Fix a typo in comment.
2014-09-16 08:59:03 +00:00
Adam Powell
7276265f31 am 9965e970: am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev
* commit '9965e9708b5dc64bc9e591f72ff6eaf6c3968d0f':
  Treat empty string as title-set in ToolbarWidgetWrapper
2014-09-16 08:58:58 +00:00
ztenghui
9a51c4b17d am 64672ef1: am 3137b288: Merge "Set cache dirty when re-create the cache bitmap" into lmp-dev
* commit '64672ef149fa48afcf7f5f4b2ed0f96386b6d368':
  Set cache dirty when re-create the cache bitmap
2014-09-16 08:58:53 +00:00
Adam Powell
5ba05c4fb5 am acec24c1: am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev
* commit 'acec24c1487e32264ee395121db2e607259dd7ca':
  Finish materializing dialogs
2014-09-16 08:58:48 +00:00
Jeff Tinker
a1f08c7ca8 am e05de24f: am 2596d6de: Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-dev
* commit 'e05de24fb81c0ddc24faf38f7d4bc6d0753d9051':
  Document retry behavior for MediaCodec.CryptoException
2014-09-16 08:58:44 +00:00
Jeff Sharkey
41159f3193 am 8d121c34: am 6abc3ef8: Merge "Whoops, wait around for pm result." into lmp-dev
* commit '8d121c344470001c18bc86125a954bdfb4ea95b0':
  Whoops, wait around for pm result.
2014-09-16 08:58:40 +00:00
Yorke Lee
5a5bce9c75 am 9ea1f83a: am 4d4f62ba: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev
* commit '9ea1f83ae498a9bcd77a1c99cce28352ef79000a':
  No longer require READ_PHONE_STATE permission for getCallState
2014-09-16 08:58:35 +00:00
Chet Haase
ab387230be am bae5621a: am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev
* commit 'bae5621a7d9a60e16ff1ac7b3a5c4be06dec2305':
  Avoid invalidating view during some outline invalidations
2014-09-16 08:58:30 +00:00
Yuncheol Heo
f46a7e2dd7 am 5c0d3862: Merge "Make the playback device pass CEC CTS." into lmp-dev
* commit '5c0d38626f309598554cd488e9a4c30836875280':
  Make the playback device pass CEC CTS.
2014-09-16 08:42:56 +00:00
Svetoslav
5a51947dee am 42f75e9f: Merge "Missing or wrong pages in preview when scorlling large docs." into lmp-dev
* commit '42f75e9f5cfddb56d23a027bceed2f72e172aae0':
  Missing or wrong pages in preview when scorlling large docs.
2014-09-16 08:42:51 +00:00
Tsuwei Chen
50fa67bd15 am 86f1d252: Merge "Set user agent for XTRA download according to carrier specification. Bug: 17056380 Change-Id: Iacb90d4780f35fa6875702889d4a5f02610768b7" into lmp-dev
* commit '86f1d252e22a68b9fa24da01ab5bd159e4470bb3':
  Set user agent for XTRA download according to carrier specification. Bug: 17056380 Change-Id: Iacb90d4780f35fa6875702889d4a5f02610768b7
2014-09-16 08:42:47 +00:00
Svetoslav
bff16debdc am 9208a81b: Merge "Page shredder callback invoked on the wrong thread." into lmp-dev
* commit '9208a81b4bfd22ab73fa9c459653fe6d18a7b8ea':
  Page shredder callback invoked on the wrong thread.
2014-09-16 08:42:42 +00:00
Svetoslav
9dd2ff496d am c59be126: Merge "Update print preview when a printer becomes available" into lmp-dev
* commit 'c59be126443a89c23a193e67f633ccccbfd939e0':
  Update print preview when a printer becomes available
2014-09-16 08:42:37 +00:00
Jungshik Jang
f917166b6b am 8904a3c6: Merge "Fix volume change failure in HDMI-CEC system audio mode." into lmp-dev
* commit '8904a3c6ee308ecbd4ba1e8edd3635fc541391b2':
  Fix volume change failure in HDMI-CEC system audio mode.
2014-09-16 08:42:33 +00:00
Dianne Hackborn
3f65b3c420 am 9f568025: Merge "Quick fix issue #17514851: dumpsys package <package-name> includes..." into lmp-dev
* commit '9f568025129031b51d15b52259e1374459c5415a':
  Quick fix issue #17514851: dumpsys package <package-name> includes...
2014-09-16 08:42:27 +00:00
Edward Jee
1360b70f40 am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev
* commit 'c172b2090317b158974bc73d8baa141449a1d784':
  Adds APIs for Bluetooth PBAP and MAP access permission.
2014-09-16 08:42:21 +00:00
Igor Murashkin
4294f74d8a am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev
* commit '6d2cca330f2bfd7e9fc4699f3e8248762454e344':
  camera2-legacy: Fix jpeg thumbnail quality not being set
2014-09-16 08:42:16 +00:00
Adam Lesinski
006d1bc4ed am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev
* commit '1416621b4407fe8a1b488cface2be5743fa4b7a3':
  Show the lockscreen when more than 1 user is present
2014-09-16 08:42:12 +00:00