OSDN Git Service

am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition...
[android-x86/frameworks-base.git] / Android.mk
2014-03-21 Mike Lockwoodam 71060db6: am dffdf107: Merge "UsbDeviceManager:...
2014-03-21 Mike Lockwoodam 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManag...
2014-03-21 Mike Lockwoodam dffdf107: Merge "UsbDeviceManager: A better fix...
2014-03-21 Mike Lockwoodam afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race...
2014-03-21 Wei Wangam bf056846: am 058061da: Merge "Fix stopBatchedScan...
2014-03-21 Wei Wangam 058061da: Merge "Fix stopBatchedScan not working...
2014-03-21 Adam Powellam a6454ccb: am 49325305: Merge "Update contextual...
2014-03-21 Adam Powellam 49325305: Merge "Update contextual asset bar assets...
2014-03-20 Marco Nelissenam 7d09713c: am 7cd52895: am 5035faba: (-s ours) am...
2014-03-20 Marco Nelissenam 7cd52895: am 5035faba: (-s ours) am cecc6208: am...
2014-03-20 Marco Nelissenam 5035faba: (-s ours) am cecc6208: am 759445c5: resolv...
2014-03-20 Marco Nelissenam cecc6208: am 759445c5: resolved conflicts for merge...
2014-03-20 Marco Nelissenam 759445c5: resolved conflicts for merge of c53ad4cd...
2014-03-20 Marco Nelissenresolved conflicts for merge of c53ad4cd to jb-mr2-dev
2014-03-20 Vinit Deshapndeam f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use...
2014-03-20 Vinit Deshapndeam 52bc363c: Merge "DO NOT MERGE - Use Samoa country...
2014-03-20 Baligh Uddinam 826f3647: (-s ours) am d16505da: (-s ours) Merge...
2014-03-20 Baligh Uddinam d16505da: (-s ours) Merge "Import translations....
2014-03-20 Marco Nelissenam 81fbdade: resolved conflicts for merge of 534f3e94...
2014-03-20 Marco Nelissenresolved conflicts for merge of 534f3e94 to jb-mr1-dev
2014-03-20 Marco Nelissenam a3337bc7: Merge "Verify certificates" into jb-dev
2014-03-20 Adam Kocham 5a510a2c: am 6398a86f: Merge "Point bitmaps training...
2014-03-20 Scott Mainam e02d5a20: am a32c4376: update to wear docs. includes...
2014-03-20 Wei Wangam 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise...
2014-03-20 Adam Kocham 6398a86f: Merge "Point bitmaps training class to...
2014-03-20 Scott Mainam a32c4376: update to wear docs. includes javadoc...
2014-03-20 Wei Wangam c0384b6b: DO NOT MERGE: Move advetise clean up to...
2014-03-20 Wei Wangam 15a18d07: am da084104: Merge "DO NOT MERGE: Add...
2014-03-20 Wei Wangam da084104: Merge "DO NOT MERGE: Add status callback...
2014-03-20 Jim Milleram 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory...
2014-03-20 Jim Milleram 37050124: am a413a4ae: Fix the build. DO NOT MERGE
2014-03-20 Jim Milleram 46e63117: DO NOT MERGE - Fix memory leak caused...
2014-03-20 Jim Milleram a413a4ae: Fix the build. DO NOT MERGE
2014-03-20 Chris Craikam 7c9bd98a: am 89513ee5: Merge "Fix projection offset...
2014-03-20 Jim Milleram 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug...
2014-03-20 Chris Craikam 89513ee5: Merge "Fix projection offset caching ...
2014-03-20 Jim Milleram 2598fbd7: Merge "Attempt to fix a bug where SIM...
2014-03-19 Victoria Leaseam cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb...
2014-03-19 Victoria Leaseam 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab...
2014-03-19 Victoria Leaseam e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2...
2014-03-19 Victoria Leaseam 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d...
2014-03-19 Victoria Leaseam 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca...
2014-03-19 Victoria Leaseam c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f...
2014-03-19 Craig Mautneram 1888333d: am d4375b47: Merge "Fix loop limits."...
2014-03-19 Craig Mautneram d4375b47: Merge "Fix loop limits." into klp-dev
2014-03-19 Victoria Leaseam 6eb28103: am 183f97b7: am 1c12f9e7: malloc some...
2014-03-19 Victoria Leaseam 183f97b7: am 1c12f9e7: malloc some advances
2014-03-19 Victoria Leaseam 1c12f9e7: malloc some advances
2014-03-19 Lajos Molnaram 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int...
2014-03-19 Lajos Molnaram f7b33e86: Merge "MediaPlayer: fix int overflow issue...
2014-03-19 Adam Cohenam 0dca4fc9: am 55b523cc: Merge "[DO NOT MERGE] Fix...
2014-03-19 Adam Cohenam cc8fbb59: am 8acbe888: Merge "[DO NOT MERGE] Centeri...
2014-03-19 Adam Cohenam 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper croppi...
2014-03-19 Adam Cohenam 8acbe888: Merge "[DO NOT MERGE] Centering the crop...
2014-03-19 Jeff Brownam 80af5316: am f260ed09: Merge "Fix inverted condition...
2014-03-19 Jeff Brownam f260ed09: Merge "Fix inverted conditional in View...
2014-03-19 Robert Greenwaltam bd84f01c: am 5d3d4ee3: Merge "Handle provisioning...
2014-03-19 Robert Greenwaltam 5d3d4ee3: Merge "Handle provisioning APN by turning...
2014-03-19 Robert GreenwaltMerge "Handle provisioning APN by turning off/on data...
2014-03-19 Dan SandlerMerge commit '95a7829c' into manualmerge
2014-03-19 Dan Sandleram b78dc69c: Merge "DO NOT MERGE: Maintain binding...
2014-03-19 Dave Plattam 17e7c407: am 98a027a5: Merge "Harden NsdManager...
2014-03-19 Jeff Brownam c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon...
2014-03-19 Dave Plattam 98a027a5: Merge "Harden NsdManager against null...
2014-03-19 Jeff Brownam 4cb1bc28: Merge "Refresh cast icon assets to improve...
2014-03-18 Xia Wangam 1b007565: am 9b650702: Merge "Fix state transition...
2014-03-18 Xia Wangam 9b650702: Merge "Fix state transition verification...
2014-03-18 Adrian Roosam a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am...
2014-03-18 Adrian Roosam ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am...
2014-03-18 Adrian Roosam 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am...
2014-03-18 Adrian Roosam 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am...
2014-03-18 Adrian Roosam 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am...
2014-03-18 Adrian Roosam ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am...
2014-03-18 Adrian Roosam ecba937b: DO NOT MERGE - Fix keyguard pattern lockou...
2014-03-18 Ricardo Cerveraam 965e5e85: am ace69017: docs: Reverted ADT 22.6.1...
2014-03-18 Ricardo Cerveraam ace69017: docs: Reverted ADT 22.6.1 links
2014-03-18 Scott Mainam f60dd6e2: am 50d7dc99: add ALL of the Android Wear...
2014-03-18 Scott Mainam 50d7dc99: add ALL of the Android Wear Dev Preview...
2014-03-18 Scott Mainam 60409d80: am 81857ec5: add android wear to the home...
2014-03-18 Scott Mainam 81857ec5: add android wear to the home carousel
2014-03-17 Ricardo Cerveraam f7c3ecc1: am 71a47aa7: Merge "docs: Added release...
2014-03-17 Ricardo Cerveraam 71a47aa7: Merge "docs: Added release notes for SDK...
2014-03-17 Geoff Mendalam c3281db2: (-s ours) am 65325236: (-s ours) Import...
2014-03-17 Geoff Mendalam 65325236: (-s ours) Import translations. DO NOT...
2014-03-14 Craig MautnerMerge commit '54d5702c' into manualmerge
2014-03-14 Marco Nelissenam 105c4792: am 10a07a04: Merge "Verify certificates...
2014-03-14 Daniel 2 Olofssonam 4111e7e1: am 09421fab: Re-initialize error after...
2014-03-14 Craig Mautneram 477897ad: Merge "Fix incorrect setting of TaskRecord...
2014-03-14 Marco Nelissenam 10a07a04: Merge "Verify certificates" into klp-dev
2014-03-14 Daniel 2 Olofssonam 09421fab: Re-initialize error after attach
2014-03-14 Selim Cinekam 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash...
2014-03-14 Craig Mautneram 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\...
2014-03-14 Yohei Yukawaam fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the...
2014-03-14 Craig Mautneram a921d8b6: am 3217cc6f: Merge "Fix activities appeari...
2014-03-14 Mike Lockwoodam ff64f5ed: am 381374b3: Merge "UsbDeviceManager:...
2014-03-14 Selim Cinekam eb95e74e: DO NOT MERGE - Fixed crash for odd image...
2014-03-14 Ricardo Cerveraam 50694917: am 7e566239: Merge "docs: Updated Building...
2014-03-14 Joe Fernandezam 8bb11153: am f7267c8b: Merge "Doc change: Update...
2014-03-14 John Spurlockam ad66c27b: am 6d9b034c: Fix typo in public logcat...
2014-03-14 Ricardo Cerveraam 8714a343: am ef6c9470: Merge "docs: Added step to...
next