summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am c2e4daac: am 1f90908c: Merge "Prevent use of NFC api if device is not feat...Nick Pelly2010-10-191-1/+31
|\
| * am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NF...Nick Pelly2010-10-181-1/+31
| |\
| | * Merge "Prevent use of NFC api if device is not featurized for NFC." into ging...Nick Pelly2010-10-181-1/+31
| | |\
| | | * Prevent use of NFC api if device is not featurized for NFC.Nick Pelly2010-10-181-1/+31
* | | | Remove public resource padding.Dianne Hackborn2010-10-192-16/+1
* | | | Merge "New dialog assets. Cancelable AlertDialogs may now be canceled by tapp...Adam Powell2010-10-1831-2/+21
|\ \ \ \
| * | | | New dialog assets. Cancelable AlertDialogs may now be canceled by tapping out...Adam Powell2010-10-1831-2/+21
* | | | | Merge "Cleaned up the way StackView draws outside of its bounds"Adam Cohen2010-10-181-38/+37
|\ \ \ \ \
| * | | | | Cleaned up the way StackView draws outside of its boundsAdam Cohen2010-10-181-38/+37
* | | | | | resolved conflicts for merge of 6775754a to masterGilles Debunne2010-10-181-4/+29
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am 3d01cb93: Merge "Removed "Select word" option on password fields." into gi...Gilles Debunne2010-10-181-4/+28
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Removed "Select word" option on password fields." into gingerbreadGilles Debunne2010-10-181-4/+28
| | |\ \ \
| | | * | | Removed "Select word" option on password fields.Gilles Debunne2010-10-151-4/+28
| * | | | | am 83366dfb: Merge "Add the HTML5Audio class, to support the audio tag." into...Ben Murdoch2010-10-181-0/+224
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Add the HTML5Audio class, to support the audio tag." into gingerbreadBen Murdoch2010-10-181-0/+224
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Add the HTML5Audio class, to support the audio tag.Nicolas Roard2010-10-181-0/+224
* | | | | | am 6b09a90a: am e47150e9: Fix up NFC permissions.Nick Pelly2010-10-185-66/+33
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am e47150e9: Fix up NFC permissions.Nick Pelly2010-10-185-66/+33
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix up NFC permissions.Nick Pelly2010-10-185-66/+33
| | |/ / /
* | | | | am 774b943f: am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/an...Nick Pelly2010-10-189-610/+8
|\ \ \ \ \ | |/ / / /
| * | | | am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/interna...Nick Pelly2010-10-179-610/+8
| |\ \ \ \ | | |/ / /
| | * | | Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.Nick Pelly2010-10-179-610/+8
* | | | | am 73cd4fff: am a926540d: Implement methods introduced in draft #5 NFC API.Sylvain Fonteneau2010-10-185-22/+163
|\ \ \ \ \ | |/ / / /
| * | | | am a926540d: Implement methods introduced in draft #5 NFC API.Sylvain Fonteneau2010-10-175-22/+163
| |\ \ \ \ | | |/ / /
| | * | | Implement methods introduced in draft #5 NFC API.Sylvain Fonteneau2010-10-175-22/+163
* | | | | Merge "Fix race condition between starting of service and getting the Profile...Jaikumar Ganesh2010-10-182-0/+6
|\ \ \ \ \
| * | | | | Fix race condition between starting of service and getting the Profile Proxy.Jaikumar Ganesh2010-10-182-0/+6
* | | | | | Temporarily removed call to drawCircle in BulletSpan.Gilles Debunne2010-10-181-4/+19
* | | | | | Merge "Fix for text selection at end of line."Gilles Debunne2010-10-181-0/+4
|\ \ \ \ \ \
| * | | | | | Fix for text selection at end of line.Gilles Debunne2010-10-181-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps co...Brian Carlstrom2010-10-181-1/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contentsBrian Carlstrom2010-10-171-1/+15
* | | | | | resolved conflicts for merge of 964eb438 to masterKenny Root2010-10-185-3/+277
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am 42499170: Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-165-3/+277
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Implement issue #3094621 and #3094609 - wipe sd cardDianne Hackborn2010-10-165-3/+277
* | | | | Merge "Hide ButtonGroup - not ready for public consumption."Adam Powell2010-10-181-0/+3
|\ \ \ \ \
| * | | | | Hide ButtonGroup - not ready for public consumption.Adam Powell2010-10-181-0/+3
* | | | | | Merge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager"Steve Block2010-10-184-17/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Rename DeviceOrientationManager to DeviceMotionAndOrientationManagerSteve Block2010-10-154-17/+18
* | | | | | am 157fa0ac: am 77c011ba: Set default heap size to 5MB.Romain Guy2010-10-181-0/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 77c011ba: Set default heap size to 5MB.Romain Guy2010-10-151-0/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Set default heap size to 5MB.Romain Guy2010-10-151-0/+2
* | | | | | am 1a326022: am 208bb08a: Merge "Fix issue 3098880." into gingerbreadEric Laurent2010-10-181-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 208bb08a: Merge "Fix issue 3098880." into gingerbreadEric Laurent2010-10-151-0/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix issue 3098880." into gingerbreadEric Laurent2010-10-151-0/+4
| | |\ \ \ \
| | | * | | | Fix issue 3098880.Eric Laurent2010-10-151-0/+4
* | | | | | | am 21059b63: am 5e7b7cd6: Merge "range checking for tnf" into gingerbreadNick Kralevich2010-10-181-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5e7b7cd6: Merge "range checking for tnf" into gingerbreadNick Kralevich2010-10-151-0/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "range checking for tnf" into gingerbreadNick Kralevich2010-10-151-0/+4
| | |\ \ \ \ \
| | | * | | | | range checking for tnfNick Kralevich2010-10-151-0/+4