Fabrice Di Meglio
|
ad3f0c1705
|
am 9fe98de0: (-s ours) am e4e68219: am 88dced29: Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev
* commit '9fe98de0a9f21c0e190362c9c03563dfb241ba52':
|
2013-12-05 22:41:32 +00:00 |
|
Dianne Hackborn
|
55158d53a9
|
am e286c012: (-s ours) am 003b944d: am d81a15c6: Merge "Add method for adding two ProcessStats objects together." into klp-dev
* commit 'e286c012f2e7a71ae6de97a08dfe170fe9a50cd1':
|
2013-12-05 22:41:27 +00:00 |
|
Fabrice Di Meglio
|
278bfc6c4f
|
am 6317f13e: (-s ours) am b945d80c: am 5af4edef: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev
* commit '6317f13e419f0df239de612d29ffda8209c6d6cd':
|
2013-12-05 22:41:21 +00:00 |
|
Elliott Hughes
|
72b106e4fe
|
am d7f6aff9: (-s ours) am 795a7dec: am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception occurred."
* commit 'd7f6aff9544a5e1e9f553ee75866eaaf9c3e733d':
|
2013-12-05 22:41:16 +00:00 |
|
Mathias Agopian
|
492c01dc76
|
am 0a128348: (-s ours) am 2464fcdf: am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev
* commit '0a12834894a90c592e20e69e64e28775537e954a':
|
2013-12-05 22:41:10 +00:00 |
|
Romain Guy
|
6bc651d70a
|
am 8df8225d: (-s ours) am ac322988: am 00312300: Remove an unnecessary allocation
* commit '8df8225d8d5d15946f36e4b818c22d2e59eabe43':
|
2013-12-05 22:41:05 +00:00 |
|
Jeff Sharkey
|
1f3588a127
|
am 082c8154: (-s ours) am 1faca4cd: am 37ee68fc: Merge "Always include a default DocumentStack." into klp-dev
* commit '082c81545be6cbdf14bc91bf42b09acf54ab0816':
|
2013-12-05 22:40:59 +00:00 |
|
Svetoslav
|
186b7821c7
|
am 0785ccc2: (-s ours) am 85dbba82: am d3964489: Merge "Some hygiene for the touch explorer." into klp-dev
* commit '0785ccc2ccb5f9401e9a701db0bffd9a9f51cdb0':
|
2013-12-05 22:40:53 +00:00 |
|
Jeff Sharkey
|
8f123edf1d
|
am bb76afa9: (-s ours) am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev
* commit 'bb76afa9bcf923944786f0ce3ab76c9114cba351':
|
2013-12-05 22:40:46 +00:00 |
|
Jonathan Dixon
|
4fecb2196e
|
am 177b89e9: (-s ours) am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev
* commit '177b89e91102bd58016d9ce474a281e22426e463':
|
2013-12-05 22:40:41 +00:00 |
|
Wink Saville
|
b117600cc6
|
am f3aca5f7: (-s ours) am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit 'f3aca5f7ca94aad3f0fe7068762474e8e3f98894':
|
2013-12-05 22:40:33 +00:00 |
|
Wink Saville
|
7ac1ec4343
|
am 47dc5a34: (-s ours) am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '47dc5a34b9d861e45171591050ee9ee8248031a4':
|
2013-12-05 22:40:28 +00:00 |
|
Wink Saville
|
c2890d4fff
|
am 15357144: (-s ours) am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev
* commit '1535714401035f134f9ac8bc7d6d209eabfdc9b2':
|
2013-12-05 22:40:22 +00:00 |
|
Jeff Brown
|
aa9fdb3d3e
|
am cc951f12: (-s ours) am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev
* commit 'cc951f128900f4691e4c55c6267f003e59aa229c':
|
2013-12-05 22:40:16 +00:00 |
|
Wink Saville
|
bdc0b4b0c2
|
am 027b0651: (-s ours) am 1a5c94fc: am 280f6218: am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
* commit '027b0651eb136916eebe730441258b7e205b48cf':
|
2013-12-05 22:40:11 +00:00 |
|
Joe Malin
|
a7cd4f1832
|
am ede85d2a: (-s ours) am 6023b828: am 5f055ea1: am bc8bb009: am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs
* commit 'ede85d2a9da14569f5b0fbbc42d46214b58f23dd':
|
2013-12-05 22:40:06 +00:00 |
|
Dianne Hackborn
|
f330141789
|
am bfdb10d2: (-s ours) am db7b8e21: am 53b9065a: am 42380b6d: am 9f11f105: am 7f09ec39: Fix issue #10226007: Reset apps restores most of the changed settings...
* commit 'bfdb10d273906cb07454179b23fe78de2602b952':
|
2013-12-05 22:40:00 +00:00 |
|
destradaa
|
d3d4201e2f
|
am 89424f35: (-s ours) am b4430c5c: am 541ba710: Merge "Add FlpHal layer to support Location Batching." into klp-dev
* commit '89424f35f774076c3845226b87f9136f00751b2f':
|
2013-12-05 22:39:54 +00:00 |
|
Dianne Hackborn
|
39ee573da3
|
am 542ff71a: (-s ours) am 30d4de76: am 8a0de58e: Get ProcessStats callable from other processes.
* commit '542ff71acf35ca41ea4cffd7efd6377829527e29':
|
2013-12-05 22:39:48 +00:00 |
|
David Christie
|
905a29d7d4
|
am 7f6e1aff: (-s ours) am 262f3ff2: am 8ffe17ae: Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev
* commit '7f6e1affc2dc629c26d974a16fa707eb408fa2a8':
|
2013-12-05 22:39:43 +00:00 |
|
Vinit Deshapnde
|
2802f9d139
|
am f3eb44f2: (-s ours) am a87a28f3: am ce65961d: Merge "Use a single socket to communicate with supplicant" into klp-dev
* commit 'f3eb44f2bdf13da34445f4985a9a66b11981e339':
|
2013-12-05 22:39:37 +00:00 |
|
Joe Malin
|
ed3c683ac7
|
am b17aae49: (-s ours) am a0ef1481: am 58930af0: am 68091b9e: am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178
* commit 'b17aae49873f857c40a46ca9db1aacdcd8c33f1c':
|
2013-12-05 22:39:31 +00:00 |
|
The Android Open Source Project
|
a9e850e00a
|
am 9e70700c: (-s ours) am 8ce3bb90: (-s ours) am 350b9b9b: am 9d42e438: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '9e70700c614179b036120513665f78f3656e9af3':
|
2013-12-05 22:39:26 +00:00 |
|
Marco Nelissen
|
4a3d717374
|
am dfc34c7a: (-s ours) am a2790462: am 84135337: am 53d86f6e: am f5cfe708: am e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
* commit 'dfc34c7aa0bb03522d34b075f93d92f8d1e60e7d':
|
2013-12-05 22:39:21 +00:00 |
|
Marco Nelissen
|
6459bf65de
|
am e3a1f7b6: (-s ours) am 910ebd9e: am d6aa2471: am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit 'e3a1f7b6614e9e42f45f3de8ca3e3e07c69573bc':
|
2013-12-05 22:39:15 +00:00 |
|
Amith Yamasani
|
14ef61d9cd
|
am 1cb3c233: (-s ours) am 4458c200: am 672d323b: Merge "Developer option to force RTL layout" into klp-dev
* commit '1cb3c2332d86c06799b75e74b8263f008b79cdf3':
|
2013-12-05 22:39:10 +00:00 |
|
David Christie
|
43347a9280
|
am a840c3c5: (-s ours) am 0a2ad75d: am 4104d329: Merge "Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don\'t have to find all the different parts of the code that
* commit 'a840c3c5a5951cf2b5aae674c3cdf450ca1bd5a7':
|
2013-12-05 22:39:04 +00:00 |
|
John Spurlock
|
3d5f39a02b
|
am cb0a2ddb: (-s ours) am d5e9f2c1: am c059dbe9: Merge "Fix recent regression in hideytoast." into klp-dev
* commit 'cb0a2ddb71f0bb7bd66a5365692fb37c96c8b72f':
|
2013-12-05 22:38:58 +00:00 |
|
Daniel Sandler
|
8e497ff814
|
am 44f97445: (-s ours) am 4a76922e: am d646882a: Add missing densities for HUN backgrounds.
* commit '44f974453da560eb05b853144cc7659c7aa79b0d':
|
2013-12-05 22:38:52 +00:00 |
|
Daniel Sandler
|
2b76ff0d02
|
am c1c5d2df: (-s ours) am 9a81e154: am f6971c80: Merge "OK, now it\'s a release." into klp-dev
* commit 'c1c5d2dfd5b66e3efb73b9e18dd9f37c6d69078a':
|
2013-12-05 22:38:46 +00:00 |
|
Craig Mautner
|
1ab7817532
|
am 7815c8bd: (-s ours) am 3282fa98: (-s ours) am bd6a6e60: Use package CompatibilityInfo as default. DO NOT MERGE
* commit '7815c8bd17b85010c7203f2575bce30079c70a49':
|
2013-12-05 22:38:40 +00:00 |
|
John Spurlock
|
796e56ce27
|
am af0ea645: (-s ours) am d9c51fdc: am 7a605df3: Merge "Don\'t always auto-collapse an empty notification shade."
* commit 'af0ea64596c5a7e59f103c6832d3d7db4f384b52':
|
2013-12-05 22:38:35 +00:00 |
|
Chris Wren
|
504f0a9729
|
am 090a46b5: (-s ours) am 60708eaf: am e97f90b9: on screen off: convert heads up to full screen intent.
* commit '090a46b54cd1dc21ea4e42eb0e21b01d4a7f2587':
|
2013-12-05 22:38:30 +00:00 |
|
Chris Wren
|
b606f59727
|
am ebf8af74: (-s ours) am e7ea9466: am 6ccf0aff: Merge "heads up notifications always take the top spot"
* commit 'ebf8af7456171a2306e008afa636285dee3f4d07':
|
2013-12-05 22:38:24 +00:00 |
|
Ben Murdoch
|
ab90480550
|
am a866f6df: (-s ours) am cf67ae06: am 137e5a3b: Merge "Fix the build"
* commit 'a866f6df5e56c7a29bdceb723307bc96785358e2':
|
2013-12-05 22:38:19 +00:00 |
|
Chris Wren
|
1d81729e1d
|
am 87a4a466: (-s ours) am 4cbafb6a: am d4db6cbc: don\'t bump an active heads up for a corrupt notification
* commit '87a4a46604ac8bc8259b5af358961f69e8924b92':
|
2013-12-05 22:38:13 +00:00 |
|
Chris Wren
|
4e15cb325f
|
am 7f5709bb: (-s ours) am 10afd0f0: am 464a8ce9: Merge "Animate the heads up notification into the shade."
* commit '7f5709bbd5c193a0d08e0ffeb2d924222bc565d6':
|
2013-12-05 22:38:08 +00:00 |
|
Chris Wren
|
903f69a9d3
|
am 6241ee27: (-s ours) am 457d901b: am bb8b602b: Merge "ensure heads up slider is initialized."
* commit '6241ee27cd33857f9144a86a074992648641de59':
|
2013-12-05 22:38:02 +00:00 |
|
Chris Wren
|
01b30911db
|
am 6709285a: (-s ours) am 944e41fe: am 10dc5d97: Merge "proper geometry for heads up on tablets."
* commit '6709285ab95c7e473ee451659c6c97484e96e136':
|
2013-12-05 22:37:57 +00:00 |
|
Matt Casey
|
6bda8f17d1
|
am 96756e99: (-s ours) am 2c18bc28: am 77ece7b1: Merge "Extend assist context to foreground services"
* commit '96756e99e2f7e8d3e75aa405951b1538116c1c7a':
|
2013-12-05 22:37:52 +00:00 |
|
Martijn Coenen
|
33b8084320
|
am b35872f3: (-s ours) am 38cfa935: am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host."
* commit 'b35872f3a7622b168896c564136bf9e59ac9e96b':
|
2013-12-05 22:37:46 +00:00 |
|
Ying Wang
|
153dbe90bf
|
am 3cc887c5: (-s ours) am 265bbb56: am 610247fb: Merge "Fix for build breakage. Correcting the documentatation link in Sensor.java. I added a wrong link {@link #SENSOR_TYPE_ROTATION_VECTOR} instead of {@link #TYPE_ROTATION_VECTOR}."
* commit '3cc887c526f75f8ff09a6dd880427e719236cb7c':
|
2013-12-05 22:37:38 +00:00 |
|
Lorenzo Colitti
|
1017ecb27f
|
am 2316b2b3: (-s ours) am b9f16399: am a50f4b1d: Merge "Simplify LinkPropertiesTest."
* commit '2316b2b31611d762f9b6370ae8c6b17e238b8473':
|
2013-12-05 22:37:33 +00:00 |
|
Svetoslav Ganov
|
c2bd32783e
|
am 42bf3aaa: (-s ours) am c8916c9d: am 1194d3f7: Merge "Print UI polish based on UX feedback."
* commit '42bf3aaaa4a1b1c80bf190be5b89b84b2f5cbcd2':
|
2013-12-05 22:37:26 +00:00 |
|
Satoshi Kataoka
|
afc55064ae
|
am 96c5475f: (-s ours) am acc497e4: am b3c21ac7: Reduce the transaction fee of getEnabledInputMethodSubtypeList
* commit '96c5475f61e8a16622865ca3d629ac62e14f9203':
|
2013-12-05 22:37:19 +00:00 |
|
Jeff Sharkey
|
16d083da1d
|
am 83852c5f: (-s ours) am 20d49271: am 26d4adf3: Merge "Better handling of broken storage providers."
* commit '83852c5ff44aef7c0dd1791d14294f443767926c':
|
2013-12-05 22:37:14 +00:00 |
|
Aravind Akella
|
0361e12c16
|
am 6904c5f0: (-s ours) am d262fb60: am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR."
* commit '6904c5f07a9a05d6174f1c2005f569a722d2fcc7':
|
2013-12-05 22:37:08 +00:00 |
|
Jeff Brown
|
c7aabc6224
|
am a2e33fba: (-s ours) am cdd4269d: am 16ae0cf1: Merge "Add more virtual display tests."
* commit 'a2e33fbaec63f6f67cacea7816660b45d19414e6':
|
2013-12-05 22:37:01 +00:00 |
|
Jeff Brown
|
626fb9a7b4
|
am 30345f64: (-s ours) am 89fe7541: am 7a54069a: Merge "Dump information about recent input events."
* commit '30345f64e8717c761f38fa1fd24378e2ac6805b3':
|
2013-12-05 22:36:54 +00:00 |
|
Jeff Brown
|
ed2f7bf4f5
|
am 8cfbb064: (-s ours) am 33f8fbd3: am 1dc14aeb: Merge "Fix propagation of display overscan information."
* commit '8cfbb064666d5a468d49badea125e8059afe0332':
|
2013-12-05 22:36:46 +00:00 |
|