167045 Commits

Author SHA1 Message Date
Etan Cohen
5fef96c5a6 am eaecf6a2: am d5ea3240: am c3f8a8b1: am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying.
* commit 'eaecf6a2c98169534dc8d4bd98099b3731b67b1d':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
2014-10-10 22:06:38 +00:00
Jorim Jaggi
6151222e31 am 1137ea7e: am 782994ef: am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev
* commit '1137ea7eaf9d806b17a110c2f8ddfa21b58fc3fc':
  Apply color to progress bar for notifications
2014-10-10 18:41:48 +00:00
Elliott Hughes
e4384e93ad am 801dbe73: am 67ed9bde: am 011c96b5: Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev
* commit '801dbe73abc712e3c4fb8d3d0e760346591349ce':
  Remove some unused %% strings from frameworks/base.
2014-10-10 18:41:42 +00:00
Elliott Hughes
3f679eb3a7 am be002304: am 8d092c23: am 7d32838d: Merge "Track change to private libcore data structure." into lmp-mr1-dev
* commit 'be002304a39428677b91f0d9fa6d96d9f51be760':
  Track change to private libcore data structure.
2014-10-10 18:41:37 +00:00
Adam Powell
5093be6a54 am f0eba024: am 0f61804f: am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev
* commit 'f0eba02485e10d4d9a843e67a05ca345c81f0741':
  Document that MarginLayoutParams margins should be positive.
2014-10-10 18:41:31 +00:00
Adam Powell
892a8095aa am de640f02: am 02091f07: am 19a9e6c2: Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev
* commit 'de640f02108f327a9920a2c4b435a7d425c3ef78':
  Throw a more descriptive exception when adding null to a ViewGroup
2014-10-10 18:41:25 +00:00
Robin Lee
effb3c7d75 am 967bc00f: am d92e9beb: am 499a3629: am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev
* commit '967bc00fc1067d27159a6d9e528db941e6d53ec2':
  DevicePolicy: One cert tracker warning per profile
2014-10-10 18:41:19 +00:00
Joe Fernandez
b03b9661ed am 5d5f3d1d: am d240b98f: am b455eb7b: am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
* commit '5d5f3d1d873a11b0a1b927f8c08b8c0c7cc732b4':
  docs: Android TV publishing requirements
2014-10-10 18:41:13 +00:00
Chong Zhang
582570a78e am 67253051: am 8dac6fe7: am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost
* commit '672530513782944d7271f880679f751c2d618d15':
  MediaHTTPConnection: do not use proxy for localhost
2014-10-10 18:41:07 +00:00
Christopher Tate
26baaa48b4 am 798965a6: am c049e123: am 97cb995e: am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev
* commit '798965a693ff0a5ab1cdbba5d7ae5b6b23193edb':
  Also monitor MOVED_TO events for wallpaper updates
2014-10-10 18:41:01 +00:00
Fred Fettinger
683dca32a8 am a6758f66: (-s ours) am 0ebdc70d: am 1114b3b8: am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
* commit 'a6758f664ae97cc579967d7a73826110e51f5d57':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
2014-10-10 18:40:55 +00:00
mike dooley
324aa02703 am 7f1f1391: am a83896ce: am 6e24a156: am 3175824a: am 879142bf: Fix hangouts conference calling regression.
* commit '7f1f1391c25eef6b951c99234fbafe60c8d747ff':
  Fix hangouts conference calling regression.
2014-10-10 18:40:49 +00:00
Tim Kilbourn
716b1f1992 am 9d285e7f: am 79297f3c: am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev
* commit '9d285e7f9905923a23c400ab76b630e4ad7c8c91':
  Don't start SearchDialog on television.
2014-10-10 18:40:44 +00:00
Jeff Brown
60eba29a0b am 1a624272: am 847d2692: am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev
* commit '1a624272315c45903240fda1807505fc47c6e83e':
  Ensure we correctly unblank displays when added.
2014-10-10 18:40:39 +00:00
smain@google.com
e3aa88b805 am ea2a8ba4: am efdf63a7: am 8aa0e547: am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below
* commit 'ea2a8ba464ed68eac7f0c75c7513b07751484578':
  fix unclickable link due to overlay from offset dev below
2014-10-10 18:40:33 +00:00
smain@google.com
b90ca71683 am 5c90ccc3: am 520100d5: am fc696fb6: am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev
* commit '5c90ccc34e3fc13ac9c0ffbc52581bf02c0bf32b':
  update droiddoc option to include api level 21 for javadoc tagging
2014-10-10 18:40:28 +00:00
Christopher Tate
5f93e86d4a am 5a651161: am 353e4a99: am c09f6e69: am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev
* commit '5a65116141e393a67e263f60c627d0ffd0cba6fa':
  Actually tell the widget service that restore is starting
2014-10-10 18:40:23 +00:00
Jeff Hao
d4c82779a8 am 915bd5ca: am 4b34b329: am 6b7515dd: Merge "Improve priority ordering of apps when performing boot dexopt." into lmp-mr1-dev
* commit '915bd5ca4f8391ac3aaf346e294041719115dd4b':
  Improve priority ordering of apps when performing boot dexopt.
2014-10-10 18:40:17 +00:00
RoboErik
fb17acf432 am ee512f51: am d9be933f: am 51ff1c93: am f9122232: am a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev
* commit 'ee512f515fd0f7e36c5f9b78b8645d114dfc03db':
  Ensure metadata bundles are unparceled before making them available
2014-10-10 18:40:11 +00:00
Christopher Tate
f74fb2b3a5 am eb129805: am 05d7f0df: am a4d5471f: am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev
* commit 'eb129805b5460709a7f4155530b7863656dc0d96':
  Turn on dimension validation in wallpaper restore
2014-10-10 18:40:06 +00:00
Georgi Nikolov
ab7b08a500 am 3cda4792: am fb7bf887: am ffdc68e0: am 682d77dc: am 6eb0f480: Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev
* commit '3cda47927a1e4f1f74c1a73e09564417d413dfbd':
  BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler
2014-10-10 18:40:00 +00:00
Ye Wen
2448f432d0 am b9e98459: am b6566c37: am ac9d81b9: am 108ba84a: am de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev
* commit 'b9e984594c50ee973140914693bd509651a27809':
  Make MmsServiceBroker more robust to MmsService crashes
2014-10-10 18:39:55 +00:00
Adam Lesinski
a5ebe01da3 am 557b8d7c: am bd1867e4: am 03be7ab5: am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev
* commit '557b8d7cbdeaeeaaea792f6a85c74cfb34845e41':
  Remove UsageEvents#resetToStart() as it doesn't work
2014-10-10 18:39:49 +00:00
ztenghui
846d53c1d5 am 39af6ae0: am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev
* commit '39af6ae064399ad58023752732ed2d388e897736':
  Support dot separation as the svg path data did.
2014-10-10 18:39:43 +00:00
Etan Cohen
eaecf6a2c9 am d5ea3240: am c3f8a8b1: am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying.
* commit 'd5ea324063b2dedc844b1aca65d485b03196a6a1':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
2014-10-10 17:14:18 +00:00
Jorim Jaggi
1137ea7eaf am 782994ef: am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev
* commit '782994efd30a153af44c38a9871d24fecb0eb609':
  Apply color to progress bar for notifications
2014-10-10 17:01:07 +00:00
Elliott Hughes
801dbe73ab am 67ed9bde: am 011c96b5: Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev
* commit '67ed9bdef98d85dc4da0b5afdd8e702f0bc72793':
  Remove some unused %% strings from frameworks/base.
2014-10-10 17:00:47 +00:00
Elliott Hughes
be002304a3 am 8d092c23: am 7d32838d: Merge "Track change to private libcore data structure." into lmp-mr1-dev
* commit '8d092c231ff42fdef51507bcb6071ac55678b80f':
  Track change to private libcore data structure.
2014-10-10 17:00:41 +00:00
Adam Powell
f0eba02485 am 0f61804f: am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev
* commit '0f61804f18988dd547d3d56aef40a13aa59d3ce6':
  Document that MarginLayoutParams margins should be positive.
2014-10-10 17:00:35 +00:00
Adam Powell
de640f0210 am 02091f07: am 19a9e6c2: Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev
* commit '02091f071ad2b4754c9f4c7a66738d0d661c0c0e':
  Throw a more descriptive exception when adding null to a ViewGroup
2014-10-10 17:00:30 +00:00
Robin Lee
967bc00fc1 am d92e9beb: am 499a3629: am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev
* commit 'd92e9bebdfb37a220cc35d9f64292d4e854a7d6e':
  DevicePolicy: One cert tracker warning per profile
2014-10-10 16:59:31 +00:00
Joe Fernandez
5d5f3d1d87 am d240b98f: am b455eb7b: am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
* commit 'd240b98f999533904db68cba93ea25c255f0ae53':
  docs: Android TV publishing requirements
2014-10-10 16:59:26 +00:00
Chong Zhang
6725305137 am 8dac6fe7: am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost
* commit '8dac6fe7ae724549607b6400bdfc789f7a323472':
  MediaHTTPConnection: do not use proxy for localhost
2014-10-10 16:59:22 +00:00
Christopher Tate
798965a693 am c049e123: am 97cb995e: am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev
* commit 'c049e123bec7a573b012a2a024cbbb55ce32c402':
  Also monitor MOVED_TO events for wallpaper updates
2014-10-10 16:59:17 +00:00
Fred Fettinger
a6758f664a am 0ebdc70d: am 1114b3b8: am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
* commit '0ebdc70d7a9b0cd38cfd6105135133c888075ef1':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
2014-10-10 16:59:13 +00:00
mike dooley
7f1f1391c2 am a83896ce: am 6e24a156: am 3175824a: am 879142bf: Fix hangouts conference calling regression.
* commit 'a83896ce73c56e3b16c8333cf442ebdbe7f9b8d0':
  Fix hangouts conference calling regression.
2014-10-10 16:59:08 +00:00
Tim Kilbourn
9d285e7f99 am 79297f3c: am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev
* commit '79297f3c1c7898a194310169ef499889ed544a57':
  Don't start SearchDialog on television.
2014-10-10 16:59:04 +00:00
Jeff Brown
1a62427231 am 847d2692: am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev
* commit '847d2692978bb8efcd5335feb3ea27aa87948f42':
  Ensure we correctly unblank displays when added.
2014-10-10 16:59:00 +00:00
smain@google.com
ea2a8ba464 am efdf63a7: am 8aa0e547: am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below
* commit 'efdf63a74e101d4c37b50b6ad18ddbefc4d74c37':
  fix unclickable link due to overlay from offset dev below
2014-10-10 16:58:55 +00:00
smain@google.com
5c90ccc34e am 520100d5: am fc696fb6: am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev
* commit '520100d569127a23052478e0420f5feacbf8b366':
  update droiddoc option to include api level 21 for javadoc tagging
2014-10-10 16:58:50 +00:00
Christopher Tate
5a65116141 am 353e4a99: am c09f6e69: am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev
* commit '353e4a99e92dbf8739b91e868aad7c2a86f0a7e7':
  Actually tell the widget service that restore is starting
2014-10-10 16:58:45 +00:00
Jeff Hao
915bd5ca4f am 4b34b329: am 6b7515dd: Merge "Improve priority ordering of apps when performing boot dexopt." into lmp-mr1-dev
* commit '4b34b329fb242985eedec63418b50357b00f6bd8':
  Improve priority ordering of apps when performing boot dexopt.
2014-10-10 16:58:14 +00:00
RoboErik
ee512f515f am d9be933f: am 51ff1c93: am f9122232: am a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev
* commit 'd9be933fc2e68f5f1ec5503e72f39b85abd65b52':
  Ensure metadata bundles are unparceled before making them available
2014-10-10 16:57:55 +00:00
Christopher Tate
eb129805b5 am 05d7f0df: am a4d5471f: am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev
* commit '05d7f0dfe8352aab87d35f42209b1d34ae30b2d1':
  Turn on dimension validation in wallpaper restore
2014-10-10 16:57:50 +00:00
Georgi Nikolov
3cda47927a am fb7bf887: am ffdc68e0: am 682d77dc: am 6eb0f480: Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev
* commit 'fb7bf887eeacae9de156f819f0575d250b8efc06':
  BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler
2014-10-10 16:57:45 +00:00
Ye Wen
b9e984594c am b6566c37: am ac9d81b9: am 108ba84a: am de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev
* commit 'b6566c373160ab09f346092abeb32eee2928bce1':
  Make MmsServiceBroker more robust to MmsService crashes
2014-10-10 16:57:40 +00:00
Adam Lesinski
557b8d7cbd am bd1867e4: am 03be7ab5: am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev
* commit 'bd1867e48e9655c266fa901ec7bc9f85f8fb5c11':
  Remove UsageEvents#resetToStart() as it doesn't work
2014-10-10 16:57:35 +00:00
ztenghui
39af6ae064 am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev
* commit 'a92dd37feb28923c1633b85d12382bc2aa2e03da':
  Support dot separation as the svg path data did.
2014-10-10 16:57:03 +00:00
Geoff Mendal
cd66707c7b am ad54e37f: (-s ours) am a036088d: (-s ours) am c1f4c0fe: (-s ours) am e73bb6e0: (-s ours) am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'ad54e37f3da97fe4b3607e989eb51968d8963861':
  Import translations. DO NOT MERGE
2014-10-10 05:41:46 +00:00
Quddus Chong
22e1ff0014 am 45d4e141: am 39dd5163: am 00c1c564: am 10be6fed: am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
* commit '45d4e141d4171cad97dc97262ceb0e943506bc44':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
2014-10-10 05:41:41 +00:00