summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am bdc2f66d: am 892f371c: Merge "Encapsulate locks in UEventObservers." into ...Jeff Brown2012-08-201-84/+112
|\
| * Merge "Encapsulate locks in UEventObservers." into jb-mr1-devJeff Brown2012-08-201-84/+112
| |\
| | * Encapsulate locks in UEventObservers.Jeff Brown2012-08-201-84/+112
* | | am 6fee1cba: am 4b72463d: Merge "Add factory test feature to shut off on long...Jeff Brown2012-08-202-2/+37
|\ \ \ | |/ /
| * | Merge "Add factory test feature to shut off on long press power." into jb-mr1...Jeff Brown2012-08-202-2/+37
| |\ \ | | |/
| | * Add factory test feature to shut off on long press power.Jeff Brown2012-08-202-2/+37
* | | am d87fd2e1: am c2cb8d22: Merge "Support scrolling layers with the mousewheel...John Reck2012-08-201-3/+7
|\ \ \ | |/ /
| * | Merge "Support scrolling layers with the mousewheel" into jb-mr1-devJohn Reck2012-08-201-3/+7
| |\ \
| | * | Support scrolling layers with the mousewheelJohn Reck2012-08-201-3/+7
| | |/
* | | am 8318cf99: am a5d5d608: Merge "add wireless charger support" into jb-mr1-devBrian Muramatsu2012-08-203-0/+6
|\ \ \ | |/ /
| * | Merge "add wireless charger support" into jb-mr1-devBrian Muramatsu2012-08-203-0/+6
| |\ \
| | * | add wireless charger supportBrian Muramatsu2012-08-203-0/+6
| * | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-2049-2/+286
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2049-2/+286
| | | |/ | | |/|
* | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-2049-2/+278
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2049-2/+278
* | | | | am 6ba73cc6: am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to ...Jean-Baptiste Queru2012-08-201-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | resolved conflicts for merge of 4ea6a8eb to jb-mr1-devJean-Baptiste Queru2012-08-201-1/+1
| |\ \ \ \
| | * \ \ \ am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"Jean-Baptiste Queru2012-08-201-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge "Switch widget: Fix ON/OFF option update error"Jean-Baptiste Queru2012-08-201-1/+1
| | | |\ \ \ \
| | | | * | | | Switch widget: Fix ON/OFF option update errorYu Haonong2012-07-181-1/+1
* | | | | | | | am e6bc1238: am 7b7feee8: Merge "Add UsbDebuggingManager and UsbDebuggingActi...Benoit Goby2012-08-201-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-devBenoit Goby2012-08-201-0/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Add UsbDebuggingManager and UsbDebuggingActivityBenoit Goby2012-08-201-0/+8
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | am 8916311d: am a811e084: Merge "Pass URLs to package verifiers" into jb-mr1-devrich cannings2012-08-207-8/+435
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Pass URLs to package verifiers" into jb-mr1-devrich cannings2012-08-207-8/+435
| |\ \ \ \ \ \ \
| | * | | | | | | Pass URLs to package verifiersrich cannings2012-08-207-8/+435
* | | | | | | | | am 7cb07962: am 672cfdc5: Merge "Add AndroidKeyStore provider for KeyStore AP...Kenny Root2012-08-201-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-devKenny Root2012-08-201-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add AndroidKeyStore provider for KeyStore APIKenny Root2012-08-201-0/+4
* | | | | | | | | | am 00d2eba5: am 9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." int...George Mount2012-08-205-3/+48
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-devGeorge Mount2012-08-205-3/+48
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add getDefaultUserAgent to WebSettings.George Mount2012-08-175-3/+48
| * | | | | | | | | | DO NOT MERGE LocaleSpan makes Han disambiguation easy!Victoria Lease2012-08-203-0/+112
| * | | | | | | | | | Merge "DO NOT MERGE Han Preference" into jb-mr1-devVictoria Lease2012-08-203-7/+64
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | DO NOT MERGE Han PreferenceBilly Hewlett2012-08-203-7/+64
| | | |_|_|/ / / / / / | | |/| | | | | | | |
* | | | | | | | | | | am 3ca1e412: am 80618d66: am 7d5b22af: am f029c22f: Merge "Use Libcore.os.uma...Kenny Root2012-08-203-11/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask"Kenny Root2012-08-203-11/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | am f029c22f: Merge "Use Libcore.os.umask for setting umask"Kenny Root2012-08-203-11/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Use Libcore.os.umask for setting umaskKenny Root2012-08-203-11/+5
| | * | | | | | | | | am 6626398a: Merge "Fix for updating TCP buffer size when switching network t...Robert Greenwalt2012-08-172-2/+17
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "Fix for updating TCP buffer size when switching network type"Robert Greenwalt2012-08-172-2/+17
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix for updating TCP buffer size when switching network typeMagnus Strandberg2012-08-172-2/+17
* | | | | | | | | | | | am bb1d9847: am 80bb8d29: Merge "Update TCP buffer size when switching networ...Robert Greenwalt2012-08-202-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Update TCP buffer size when switching network typeRobert Greenwalt2012-08-202-2/+17
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | am 947c6424: am 99de2459: Merge "Respect child drawing order when dispatching...Adam Powell2012-08-201-3/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Respect child drawing order when dispatching touch events" into jb-mr1...Adam Powell2012-08-201-3/+8
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Respect child drawing order when dispatching touch eventsAdam Powell2012-08-171-3/+8
* | | | | | | | | | | | am 0430aab3: am 091d56ca: Fix double call to TTS connection disconnect() on r...Przemyslaw Szczepaniak2012-08-201-9/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Fix double call to TTS connection disconnect() on reconnectPrzemyslaw Szczepaniak2012-08-201-9/+20
| | |_|_|_|/ / / / / | |/| | | | | | | |