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 |
|
Jeff Sharkey
|
082c81545b
|
am 1faca4cd: am 37ee68fc: Merge "Always include a default DocumentStack." into klp-dev
* commit '1faca4cd10eaff01a575288e8484a72be66f148f':
|
2013-12-05 19:37:44 +00:00 |
|
Svetoslav
|
0785ccc2cc
|
am 85dbba82: am d3964489: Merge "Some hygiene for the touch explorer." into klp-dev
* commit '85dbba82dffd68867623ab7e881f8adb55ff0428':
|
2013-12-05 19:37:27 +00:00 |
|
Jeff Sharkey
|
bb76afa9bc
|
am 87a61b83: am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev
* commit '87a61b838c5cc411853317663beaa46539fd56ef':
|
2013-12-05 19:37:20 +00:00 |
|
Jonathan Dixon
|
177b89e911
|
am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev
* commit 'de3ff4b4859a92a19d84b33f5a93a0b3454698e6':
|
2013-12-05 19:37:12 +00:00 |
|
Wink Saville
|
f3aca5f7ca
|
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 '8418a309a3e228538a2cf921f386326a9afe394b':
|
2013-12-05 19:36:33 +00:00 |
|
Wink Saville
|
47dc5a34b9
|
am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '8eec0cbe01064156c52a87592796a4352f31a451':
|
2013-12-05 19:36:10 +00:00 |
|
Wink Saville
|
1535714401
|
am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev
* commit '94e9e8f16a7a72d1491694b44006b96212d8076e':
|
2013-12-05 19:35:35 +00:00 |
|
Jeff Brown
|
cc951f1289
|
am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev
* commit '1c7799e2f35b707c5f5d6544a6d94cd4892891da':
|
2013-12-05 19:35:27 +00:00 |
|
Wink Saville
|
027b0651eb
|
am 1a5c94fc: am 280f6218: am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
* commit '1a5c94fc65038c72045a5cf5509f2cf152c6c406':
|
2013-12-05 19:35:18 +00:00 |
|
Joe Malin
|
ede85d2a9d
|
am 6023b828: am 5f055ea1: am bc8bb009: am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs
* commit '6023b8289d030e8bf88be33c5f04d298748bd6f4':
|
2013-12-05 19:35:10 +00:00 |
|
Dianne Hackborn
|
bfdb10d273
|
am db7b8e21: am 53b9065a: am 42380b6d: am 9f11f105: am 7f09ec39: Fix issue #10226007: Reset apps restores most of the changed settings...
* commit 'db7b8e210d97548b8ed21b6453e1e4100b23a07f':
|
2013-12-05 19:35:03 +00:00 |
|
destradaa
|
89424f35f7
|
am b4430c5c: am 541ba710: Merge "Add FlpHal layer to support Location Batching." into klp-dev
* commit 'b4430c5c265a9456356aca71792d5d113f2454ab':
|
2013-12-05 19:33:23 +00:00 |
|
Dianne Hackborn
|
542ff71acf
|
am 30d4de76: am 8a0de58e: Get ProcessStats callable from other processes.
* commit '30d4de76b1ad224bd41c7581b5beb4ace2020398':
|
2013-12-05 19:33:14 +00:00 |
|
David Christie
|
7f6e1affc2
|
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 '262f3ff288d7da3be8db4c38200e5501e87a3445':
|
2013-12-05 19:32:59 +00:00 |
|
Vinit Deshapnde
|
f3eb44f2bd
|
am a87a28f3: am ce65961d: Merge "Use a single socket to communicate with supplicant" into klp-dev
* commit 'a87a28f392cab40569fb17561539081c65cbff13':
|
2013-12-05 19:32:41 +00:00 |
|
Joe Malin
|
b17aae4987
|
am a0ef1481: am 58930af0: am 68091b9e: am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178
* commit 'a0ef14817600623efcb43fa82f308c5a104f75c4':
|
2013-12-05 19:32:33 +00:00 |
|