Scott Main
|
f3392155b6
|
am d7889768: (-s ours) am 07b9b3ad: am b45b39a2: am cdf3455c: am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later."
* commit 'd7889768b1bbb78e15ddc96575180252f1b4a5cf':
|
2013-12-05 22:44:18 +00:00 |
|
Scott Main
|
8517e7e021
|
am 6fa95b46: (-s ours) am 93e5dc65: am fefff422: am 7466b998: am ebcee197: Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later.
* commit '6fa95b46ec7d2a267aa0b732a460588d7c75efcb':
|
2013-12-05 22:44:12 +00:00 |
|
Andreas Huber
|
2177ee41d2
|
am 2717e4ea: (-s ours) am cee3a2a5: am 8d5f3e31: Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef
* commit '2717e4eabe581d4f461918f78fead736f65667ae':
|
2013-12-05 22:44:06 +00:00 |
|
Martin Kosiba
|
8f59c07043
|
am 1d4ddb05: (-s ours) am f8d747b3: (-s ours) am 9a68f82f: Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE
* commit '1d4ddb05e609b2f04aec16c1a06edad1c2232741':
|
2013-12-05 22:44:01 +00:00 |
|
Ben Murdoch
|
fb4482c5ee
|
am 231fb187: (-s ours) am 4826434c: am ed735c9a: Add missing cleanspec
* commit '231fb187f5b29bf0a1d377e18a9b44b15fd86244':
|
2013-12-05 22:43:56 +00:00 |
|
Jeff Sharkey
|
642596f3cc
|
am 20861b8f: (-s ours) am 35d525c9: am 998cfa2c: Merge "API to discover granted Uri permissions." into klp-dev
* commit '20861b8f16015c5e5b89bdc8025cc311aeff6883':
|
2013-12-05 22:43:50 +00:00 |
|
Jeff Sharkey
|
e50892e01b
|
am 49ab0f16: (-s ours) am 34412965: am c2f8da87: Merge "Bring along BridgeContext for the ride." into klp-dev
* commit '49ab0f1636833270019b3c1ed733b0a4129f08be':
|
2013-12-05 22:43:45 +00:00 |
|
Jeff Sharkey
|
35419830c6
|
am ccff82ee: (-s ours) am 0c305430: am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev
* commit 'ccff82ee2f3d44088c4e7dd1de7e11de4150b63a':
|
2013-12-05 22:43:40 +00:00 |
|
Jeff Sharkey
|
3f9ceb0cbf
|
am 134f1e9b: (-s ours) am 1d685ec0: am 6e14b22c: Merge "APIs for multiple external storage devices." into klp-dev
* commit '134f1e9bdc0922e6e0a6c14978712736797ff04f':
|
2013-12-05 22:43:35 +00:00 |
|
Svetoslav Ganov
|
5dc434e21e
|
am 892c8f3d: (-s ours) am 09848031: am b8160401: Merge "Fix the build" into klp-dev
* commit '892c8f3d633301b2c6efa5ca38dd375c907612a3':
|
2013-12-05 22:43:29 +00:00 |
|
Svetoslav Ganov
|
94dbf1fb19
|
am ee6556ab: (-s ours) am e1c2dfee: am c7c4d6dd: Merge "Refinement of the print service APIs." into klp-dev
* commit 'ee6556abc93f40955a745b0d2c3329d731c360b4':
|
2013-12-05 22:43:24 +00:00 |
|
Craig Mautner
|
a9cd87641d
|
am 61dce579: (-s ours) am b8029214: am 0dd303cf: Merge "Put animation background behind visible wallpaper" into klp-dev
* commit '61dce5799a9b037a1ce4d1e723453211391e9237':
|
2013-12-05 22:43:19 +00:00 |
|
Wink Saville
|
afefad3213
|
am 0816267f: (-s ours) am a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and its reference null.
* commit '0816267f70c9ef14e31f49ffd9bdf4c38a917f48':
|
2013-12-05 22:43:14 +00:00 |
|
Katie McCormick
|
2a43b6811d
|
am 980ae54d: (-s ours) am 2954c1b9: am 7a7c35e2: am 94c529b8: am 385bb2eb: resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev
* commit '980ae54d3c1dec8e5e620b9e471fed98402b888c':
|
2013-12-05 22:43:08 +00:00 |
|
Zhihai Xu
|
b989320598
|
am 87251061: (-s ours) am 71716cc5: am 97aaa8f0: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
* commit '8725106123f62cb5057beaba65f3c013b4e5a140':
|
2013-12-05 22:43:03 +00:00 |
|
destradaa
|
01431b0757
|
am 5174a7a0: (-s ours) am 1b90bdf2: am f910d320: Merge "Address Robin\'s code review comments in initial FlpHal submission." into klp-dev
* commit '5174a7a05e8b80b9e6fd9420ca781c2fe494bcc0':
|
2013-12-05 22:42:57 +00:00 |
|
Dianne Hackborn
|
a7aae4f62b
|
am 3edd90d4: (-s ours) am 8e4e7a20: am 35786c34: Merge "Allow bound processes to go PROCESS_STATE_TOP." into klp-dev
* commit '3edd90d47d89332235a260f2b0787789571b2848':
|
2013-12-05 22:42:52 +00:00 |
|
Romain Guy
|
5d8abc58dc
|
am 5d6930fe: (-s ours) am c70629f1: am 583ed765: Merge "Take shadow bounds into account for quick rejects Bug #8634346" into klp-dev
* commit '5d6930fe4ea0c24f6e1fde4a250cfb941311ed7b':
|
2013-12-05 22:42:46 +00:00 |
|
Baligh Uddin
|
c6b6e7f59b
|
am e6eae160: (-s ours) am 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'e6eae1609e73205edd560846a032c89dabe9827f':
|
2013-12-05 22:42:40 +00:00 |
|
Romain Guy
|
834672cd82
|
am 1612eac0: (-s ours) am 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev
* commit '1612eac06df6ce849cb95935c70ba94093f8d321':
|
2013-12-05 22:42:34 +00:00 |
|
Baligh Uddin
|
503177ed6d
|
am 8c1df1b2: (-s ours) am 4b643f0e: (-s ours) am 40885045: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '8c1df1b24a5dd80174a548f30e9da0faf57d5ae9':
|
2013-12-05 22:42:28 +00:00 |
|
Dianne Hackborn
|
30eca9f6c0
|
am a6872c84: (-s ours) am d021b6b1: am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev
* commit 'a6872c84027552661937aad7f4aa109a174eb23f':
|
2013-12-05 22:42:23 +00:00 |
|
Chet Haase
|
d007f1260a
|
am fb113bd7: (-s ours) am 17198172: am 2b2d313e: Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev
* commit 'fb113bd71d22c32c0edc7b3da0afdbe5e38db9e6':
|
2013-12-05 22:42:18 +00:00 |
|
keunyoung
|
d742da3809
|
am 3ecda672: (-s ours) am c9bf4052: am f6c7a5fd: Merge "add local focus mode and input event injection API to Window" into klp-dev
* commit '3ecda6727db8ab035abc18a0e1505faec648c685':
|
2013-12-05 22:42:13 +00:00 |
|
Craig Mautner
|
de65187b71
|
am cf5e3137: (-s ours) am f2424907: am 52f8ef21: Merge "Add extra layout pass after draw finished." into klp-dev
* commit 'cf5e3137023edf6360f78161dc704b24e8026c49':
|
2013-12-05 22:42:08 +00:00 |
|
Colin Cross
|
1474e67e4a
|
am 9cdbcbad: (-s ours) am 00b581de: am dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev
* commit '9cdbcbadeb56041f4122343cbb2fe5d8026924d5':
|
2013-12-05 22:42:01 +00:00 |
|
Martijn Coenen
|
bf612ed53b
|
am e6a7f2c1: (-s ours) am b59dbedc: am 4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev
* commit 'e6a7f2c197d60849c8ef56b1fb24b30d1fca0d04':
|
2013-12-05 22:41:49 +00:00 |
|
Alan Viverette
|
680db96779
|
am 3b59a334: (-s ours) am bd430b25: am be11c364: Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev
* commit '3b59a3345ea9d4f77a08741572d3ca4533cd216c':
|
2013-12-05 22:41:43 +00:00 |
|
Geoffrey Borggaard
|
1dda085729
|
am 91e1cb99: (-s ours) am d1715fda: am 9b59e5aa: Merge "Add a name to the DeviceOwner" into klp-dev
* commit '91e1cb99a8f32fcd8172f9e2c95c3ff414c0c031':
|
2013-12-05 22:41:37 +00:00 |
|
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 |
|