summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add the option '-S' to use surface allocated buffers in the stagefright cmdli...Andreas Huber2011-02-282-3/+62
* Improve caching of localised strings for ChromiumBen Murdoch2011-02-282-12/+25
* Localise the regular expressions that AutoFill uses.Ben Murdoch2011-02-282-1/+146
* am 1649d91f: am a47ef32e: Merge "Doc change: Add announce for Android at GDC ...Dirk Dougherty2011-02-271-8/+4
|\
| * am a47ef32e: Merge "Doc change: Add announce for Android at GDC 2011." into h...Dirk Dougherty2011-02-271-8/+4
| |\
| | * Merge "Doc change: Add announce for Android at GDC 2011." into honeycombDirk Dougherty2011-02-271-8/+4
| | |\
| | | * Doc change: Add announce for Android at GDC 2011.Dirk Dougherty2011-02-271-8/+4
* | | | am 0dc5fdb9: am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from usi...Jamie Gennis2011-02-271-1/+1
|\ \ \ \ | |/ / /
| * | | am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer toke...Jamie Gennis2011-02-271-1/+1
| |\ \ \
| | * \ \ am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into g...Jamie Gennis2011-02-271-1/+1
| | |\ \ \
| | | * \ \ Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbreadJamie Gennis2011-02-271-1/+1
| | | |\ \ \
| | | | * | | Prevent SurfaceFlinger from using layer token 31.Jamie Gennis2011-02-101-1/+1
* | | | | | | Merge "bug:3474580 fix javadoc"Vasu Nori2011-02-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | bug:3474580 fix javadocVasu Nori2011-02-271-1/+1
* | | | | | | | Merge "Fix a regression matching intents when action doesn't matter."Jeff Brown2011-02-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix a regression matching intents when action doesn't matter.Jeff Brown2011-02-261-1/+1
* | | | | | | | | Merge "Log errors reading input channel from parcel."Jeff Brown2011-02-261-3/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Log errors reading input channel from parcel.Jeff Brown2011-02-261-3/+15
| |/ / / / / / / /
* | | | | | | | | Merge "Make SHIFT+Backspace be forward delete."Jeff Brown2011-02-261-44/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make SHIFT+Backspace be forward delete.Jeff Brown2011-02-261-44/+23
* | | | | | | | | | Merge "Add scroll wheel support to TextView."Jeff Brown2011-02-265-146/+368
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Add scroll wheel support to TextView.Jeff Brown2011-02-265-146/+368
| |/ / / / / / / /
* | | | | | | | | am 710c510b: (-s ours) am 8719c406: DO NOT MERGE: MTP: Disable MTP when the k...Mike Lockwood2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am 8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and s...Mike Lockwood2011-02-262-1/+37
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secureMike Lockwood2011-02-262-1/+37
* | | | | | | | | am fbd67fec: (-s ours) am 0600fff9: DO NOT MERGE: MTP: Add support for dynami...Mike Lockwood2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removi...Mike Lockwood2011-02-266-32/+106
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | DO NOT MERGE: MTP: Add support for dynamically adding and removing storage unitsMike Lockwood2011-02-266-32/+106
* | | | | | | | | am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy &...Mike Lockwood2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeygu...Mike Lockwood2011-02-261-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()Mike Lockwood2011-02-261-1/+1
* | | | | | | | | am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyg...Mike Lockwood2011-02-260-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | |
| * | | | | | | am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyg...Mike Lockwood2011-02-265-0/+73
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()Mike Lockwood2011-02-265-0/+73
* | | | | | | | KeyguardManager: Fix copy & paste error in isKeyguardLocked()Mike Lockwood2011-02-261-1/+1
* | | | | | | | Merge "Expand on the SurfaceTexture API docs."Jamie Gennis2011-02-251-1/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Expand on the SurfaceTexture API docs.Jamie Gennis2011-02-251-1/+7
* | | | | | | | | Merge "Handle rename of LruCache.entryEvicted to entryRemoved"Jesse Wilson2011-02-252-4/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handle rename of LruCache.entryEvicted to entryRemovedJesse Wilson2011-02-252-4/+7
* | | | | | | | | | Merge "Add support for mouse hover and scroll wheel."Jeff Brown2011-02-2519-154/+622
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add support for mouse hover and scroll wheel.Jeff Brown2011-02-2519-154/+622
* | | | | | | | | | Merge "Callback on any removal, not just evictions."Jesse Wilson2011-02-253-75/+259
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Callback on any removal, not just evictions.Jesse Wilson2011-02-253-75/+259
* | | | | | | | | | Merge "Revert the 11.xml part of bug 3438513"Glenn Kasten2011-02-251-2/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Revert the 11.xml part of bug 3438513Glenn Kasten2011-02-111-2/+0
* | | | | | | | | | Merge "Implement issue #3426299: Introduce application "stopped" state"Dianne Hackborn2011-02-2511-37/+531
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement issue #3426299: Introduce application "stopped" stateDianne Hackborn2011-02-2511-37/+531
* | | | | | | | | | | Merge "ViewPropertyAnimator cancels prior animations"Chet Haase2011-02-251-18/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ViewPropertyAnimator cancels prior animationsChet Haase2011-02-251-18/+49
* | | | | | | | | | | | am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks ...Andreas Huber2011-02-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |