Vinit Deshapnde
|
ba690f48b9
|
am f76c1685: am 049cbd64: Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev
* commit 'f76c1685a55302e95086818b5178d9af257b3e4f':
|
2013-12-05 21:29:03 +00:00 |
|
keunyoung
|
44894df5d7
|
am 72d29c2d: am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev
* commit '72d29c2d0d062122710e4d3d4eed68f04be3b275':
|
2013-12-05 21:28:57 +00:00 |
|
Michael Wright
|
054a7f5cba
|
am aad62128: am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev
* commit 'aad62128100f0c1562f9c61a721b703480ed3772':
|
2013-12-05 21:28:41 +00:00 |
|
Victoria Lease
|
5126f194c0
|
am 4b982e49: am ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev
* commit '4b982e49751c87bc4d55c3ab59958904ad9f701b':
|
2013-12-05 21:28:16 +00:00 |
|
Romain Guy
|
1668ebf484
|
am 76bf4d6d: am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev
* commit '76bf4d6dbee90268ecdf5eab63a9048fcaa8ff02':
|
2013-12-05 21:27:56 +00:00 |
|
Alan Viverette
|
f5a89a2bb3
|
am 1e68ffc7: am 890db42b: Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev
* commit '1e68ffc72fda060b316f0cf6d2a310a601965577':
|
2013-12-05 21:27:48 +00:00 |
|
Svetoslav
|
ae2b398150
|
am beb7b449: am b9b1701d: Merge "Make PrintFileDocumentAdapter non-final." into klp-dev
* commit 'beb7b44962b7dfd2a9d4cc56ec6417037ffff862':
|
2013-12-05 21:27:39 +00:00 |
|
The Android Open Source Project
|
ebcb32f58a
|
Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD
Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
|
2013-12-05 13:10:46 -08:00 |
|
Ying Wang
|
7a15f93228
|
am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
* commit 'babea8d8f2d4b3a40ab4e37646c26783c2288e87':
wifi: Remove obsolete libwpa_client library
|
2013-12-05 20:33:43 +00:00 |
|
Ying Wang
|
babea8d8f2
|
am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library"
* commit '6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41':
wifi: Remove obsolete libwpa_client library
|
2013-12-05 12:29:12 -08:00 |
|
Chet Haase
|
a004f72cf0
|
am 54276ad3: am cd89feb9: Merge "pause/resume for Animators" into klp-dev
* commit '54276ad3dabc9c1ccafb67b621a8d0f3960820c9':
|
2013-12-05 19:47:27 +00:00 |
|
Craig Mautner
|
7a9ec2cd8d
|
am afa1231e: am b6da9115: Merge "Remove incorrect warning." into klp-dev
* commit 'afa1231e75f8808f17eccdef51bce98100364521':
|
2013-12-05 19:47:14 +00:00 |
|
Katie McCormick
|
6acc2743ee
|
am dfa36da5: am 076d3787: am 6441b9bd: am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit 'dfa36da5ca9b614a0ad5e69b008920e64c0d8356':
|
2013-12-05 19:47:06 +00:00 |
|
Selim Gurun
|
aff9c48759
|
am ff1b3f07: am 1232c51e: Merge "Add the API to support webview printing" into klp-dev
* commit 'ff1b3f0789f014b4ce7e2cd47c4d47e3f70fe484':
|
2013-12-05 19:46:51 +00:00 |
|
Romain Guy
|
9b7bf2ba1e
|
am 98e50c50: am 964f2b30: Merge "Update Bitmap.createBitmap() documentation" into klp-dev
* commit '98e50c50f52b045d944df2eee0987d06eb1af07d':
|
2013-12-05 19:46:34 +00:00 |
|
Scott Main
|
d7889768b1
|
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 '07b9b3ad3b4d942b4ed920cfa8f68bce71686972':
|
2013-12-05 19:46:20 +00:00 |
|
Scott Main
|
6fa95b46ec
|
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 '93e5dc65811b146612d383cec502b6ba04a0e3d5':
|
2013-12-05 19:45:59 +00:00 |
|
Andreas Huber
|
2717e4eabe
|
am cee3a2a5: am 8d5f3e31: Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef
* commit 'cee3a2a59e9be1b875a81b6c3e885b39e16259e0':
|
2013-12-05 19:45:41 +00:00 |
|
Martin Kosiba
|
1d4ddb05e6
|
am f8d747b3: (-s ours) am 9a68f82f: Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE
* commit 'f8d747b3fd19e8dd9a09b517716b17f852d01343':
|
2013-12-05 19:44:50 +00:00 |
|
Ben Murdoch
|
231fb187f5
|
am 4826434c: am ed735c9a: Add missing cleanspec
* commit '4826434cfdb44e5cca6e4bf9c62ee9b005b71a00':
|
2013-12-05 19:44:42 +00:00 |
|
Jeff Sharkey
|
20861b8f16
|
am 35d525c9: am 998cfa2c: Merge "API to discover granted Uri permissions." into klp-dev
* commit '35d525c9b7de893fc30d7ac531769a36676ed5cb':
|
2013-12-05 19:44:32 +00:00 |
|
Jeff Sharkey
|
49ab0f1636
|
am 34412965: am c2f8da87: Merge "Bring along BridgeContext for the ride." into klp-dev
* commit '34412965f1545eaff6bb46e596f2d7ddbac7a1ab':
|
2013-12-05 19:44:24 +00:00 |
|
Jeff Sharkey
|
ccff82ee2f
|
am 0c305430: am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev
* commit '0c305430e8945f8e97ba2ce69fcbb07b903c110a':
|
2013-12-05 19:44:16 +00:00 |
|
Jeff Sharkey
|
134f1e9bdc
|
am 1d685ec0: am 6e14b22c: Merge "APIs for multiple external storage devices." into klp-dev
* commit '1d685ec0610c2047d28e59eed19ceac744146e25':
|
2013-12-05 19:44:08 +00:00 |
|
Svetoslav Ganov
|
892c8f3d63
|
am 09848031: am b8160401: Merge "Fix the build" into klp-dev
* commit '098480310f19ff83cb6c97e06deeba67326d15e2':
|
2013-12-05 19:44:01 +00:00 |
|
Svetoslav Ganov
|
ee6556abc9
|
am e1c2dfee: am c7c4d6dd: Merge "Refinement of the print service APIs." into klp-dev
* commit 'e1c2dfeebd5f8befd69ab6ec4801436a325071e5':
|
2013-12-05 19:43:53 +00:00 |
|
Craig Mautner
|
61dce5799a
|
am b8029214: am 0dd303cf: Merge "Put animation background behind visible wallpaper" into klp-dev
* commit 'b802921422b955b83b9fbf1d547cac9300dceddb':
|
2013-12-05 19:43:37 +00:00 |
|
Wink Saville
|
0816267f70
|
am a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and its reference null.
* commit 'a9f2faa9a7e7539b71b342d1923cfbc14c7e6bbd':
|
2013-12-05 19:43:28 +00:00 |
|
Katie McCormick
|
980ae54d3c
|
am 2954c1b9: am 7a7c35e2: am 94c529b8: am 385bb2eb: resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev
* commit '2954c1b95bcb01691d639728e7ec87453ed5b1d2':
|
2013-12-05 19:43:18 +00:00 |
|
Zhihai Xu
|
8725106123
|
am 71716cc5: am 97aaa8f0: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
* commit '71716cc5202550900271b83e8993a111f99dd7fd':
|
2013-12-05 19:43:09 +00:00 |
|
destradaa
|
5174a7a05e
|
am 1b90bdf2: am f910d320: Merge "Address Robin\'s code review comments in initial FlpHal submission." into klp-dev
* commit '1b90bdf2fe6de9fa51be47a81d6d220e26291e02':
|
2013-12-05 19:42:52 +00:00 |
|
Dianne Hackborn
|
3edd90d47d
|
am 8e4e7a20: am 35786c34: Merge "Allow bound processes to go PROCESS_STATE_TOP." into klp-dev
* commit '8e4e7a20f35fb0d44eee3217603dcd50f5579ca1':
|
2013-12-05 19:42:43 +00:00 |
|
Romain Guy
|
5d6930fe4e
|
am c70629f1: am 583ed765: Merge "Take shadow bounds into account for quick rejects Bug #8634346" into klp-dev
* commit 'c70629f137e9a7be757f32b2344616e8f88b57c3':
|
2013-12-05 19:41:37 +00:00 |
|
Baligh Uddin
|
e6eae1609e
|
am 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2d1716a8cdc95977c243fe8a642b41f42be565d0':
|
2013-12-05 19:41:24 +00:00 |
|
Romain Guy
|
1612eac06d
|
am 06c2bad6: am 96aadf83: Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev
* commit '06c2bad60079099b2496f2939655b72ffc649b29':
|
2013-12-05 19:41:14 +00:00 |
|
Baligh Uddin
|
8c1df1b24a
|
am 4b643f0e: (-s ours) am 40885045: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '4b643f0ebb78a554d4460626e5dedd4398b11f0a':
|
2013-12-05 19:40:56 +00:00 |
|
Dianne Hackborn
|
a6872c8402
|
am d021b6b1: am b0037316: Merge "More stuff I need for the proc stats UI." into klp-dev
* commit 'd021b6b14a801cce1b575d536323af65587f2fbe':
|
2013-12-05 19:40:33 +00:00 |
|
Chet Haase
|
fb113bd71d
|
am 17198172: am 2b2d313e: Merge "Reduce amount of invalidation when old-style animations are running" into klp-dev
* commit '1719817211743cabf53e06761ad5540518544273':
|
2013-12-05 19:40:25 +00:00 |
|
keunyoung
|
3ecda6727d
|
am c9bf4052: am f6c7a5fd: Merge "add local focus mode and input event injection API to Window" into klp-dev
* commit 'c9bf4052c71d7f473c781363bc7ff757a427c0e3':
|
2013-12-05 19:39:46 +00:00 |
|
Craig Mautner
|
cf5e313702
|
am f2424907: am 52f8ef21: Merge "Add extra layout pass after draw finished." into klp-dev
* commit 'f2424907b7763c996ef40eb1ef7a02d9a4c5bff9':
|
2013-12-05 19:39:25 +00:00 |
|
Colin Cross
|
9cdbcbadeb
|
am 00b581de: am dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev
* commit '00b581de0e3ef49ea10c5ff039d272df086750e6':
|
2013-12-05 19:39:17 +00:00 |
|
Martijn Coenen
|
e6a7f2c197
|
am b59dbedc: am 4bcc8ee6: Merge "NFC: always upper-case parsed AIDs." into klp-dev
* commit 'b59dbedceddc18e94fa75fe87523cf026e4e79b6':
|
2013-12-05 19:39:09 +00:00 |
|
Alan Viverette
|
3b59a3345e
|
am bd430b25: am be11c364: Merge "Fix padding adjustment for scrollbars in View, FastScroller" into klp-dev
* commit 'bd430b250880f8376bb4c59f62c627d90ae14324':
|
2013-12-05 19:39:00 +00:00 |
|
Geoffrey Borggaard
|
91e1cb99a8
|
am d1715fda: am 9b59e5aa: Merge "Add a name to the DeviceOwner" into klp-dev
* commit 'd1715fdaaf2a11484e6dc60710f13e2495cf6bbb':
|
2013-12-05 19:38:52 +00:00 |
|
Fabrice Di Meglio
|
9fe98de0a9
|
am e4e68219: am 88dced29: Merge "Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP" into klp-dev
* commit 'e4e68219ded0920f0e92ecce6e1cf220603942dc':
|
2013-12-05 19:38:45 +00:00 |
|
Dianne Hackborn
|
e286c012f2
|
am 003b944d: am d81a15c6: Merge "Add method for adding two ProcessStats objects together." into klp-dev
* commit '003b944d495bd8a54b61fa565a268dd2c9c21ba1':
|
2013-12-05 19:38:36 +00:00 |
|
Fabrice Di Meglio
|
6317f13e41
|
am b945d80c: am 5af4edef: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev
* commit 'b945d80c9bb91b90e48add2a4f665de02c63e28c':
|
2013-12-05 19:38:27 +00:00 |
|
Elliott Hughes
|
d7f6aff954
|
am 795a7dec: am 5adfb21e: am a0b320a6: Merge "Remove possible leak when exception occurred."
* commit '795a7decc2e9e547e0cf6291567d427a2a60517a':
Remove possible leak when exception occurred.
|
2013-12-05 19:38:19 +00:00 |
|
Mathias Agopian
|
0a12834894
|
am 2464fcdf: am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev
* commit '2464fcdf4cb33b5bfc1e4b0d61e3b9e42cffdf46':
|
2013-12-05 19:38:09 +00:00 |
|
Romain Guy
|
8df8225d8d
|
am ac322988: am 00312300: Remove an unnecessary allocation
* commit 'ac322988339d98665eff9f5937caff9a4eadd9d2':
|
2013-12-05 19:38:03 +00:00 |
|