summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 505565c3: Import translations. DO NOT MERGEBaligh Uddin2013-07-032-3/+3
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-07-032-3/+3
* | am da52b9a2: am 8113b17c: Merge "Fixed incorrect calculation of dirty invalid...Jean-Baptiste Queru2013-07-021-4/+2
|\ \
| * \ am 8113b17c: Merge "Fixed incorrect calculation of dirty invalidation area"Jean-Baptiste Queru2013-07-021-4/+2
| |\ \
| | * | Fixed incorrect calculation of dirty invalidation areaJohan Viktorsson2013-07-011-4/+2
* | | | am 9ad7b946: am 0661dd15: Merge "Expose latency methods through AudioManager ...Oliver Woodman2013-07-022-0/+26
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Expose latency methods through AudioManager and AudioTrack." into jb-m...Oliver Woodman2013-07-022-0/+26
| |\ \ \
| | * | | Expose latency methods through AudioManager and AudioTrack.Oliver Woodman2013-07-012-0/+26
* | | | | am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-m...Baligh Uddin2013-07-0149-64/+113
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-07-0249-64/+113
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2013-07-0149-64/+113
| | |/ / /
* | | | | am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityS...Wink Saville2013-07-015-0/+91
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-devWink Saville2013-07-015-0/+91
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add checkMobileProvisioning to ConnectivityService.Wink Saville2013-06-295-0/+91
* | | | | resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aospElliott Hughes2013-06-286-24/+24
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | resolved conflicts for merge of fca0f92e to stage-aosp-masterElliott Hughes2013-06-286-24/+24
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Switch frameworks/base over from @hidden Charsets to public StandardCharsets.Elliott Hughes2013-06-286-24/+24
* | | | | am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory"Kenny Root2013-06-272-14/+58
|\ \ \ \ \ | |/ / / /
| * | | | am a5a2de55: Merge "Add ALPN support to SSL socket factory"Kenny Root2013-06-272-14/+58
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add ALPN support to SSL socket factory"Kenny Root2013-06-272-14/+58
| | |\ \ \
| | | * | | Add ALPN support to SSL socket factoryKenny Root2013-06-262-14/+58
* | | | | | am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework"...Yorke Lee2013-06-271-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-devYorke Lee2013-06-271-1/+1
| |\ \ \ \ \
| | * | | | | Rename Google Talk to Hangouts in frameworkYorke Lee2013-06-121-1/+1
* | | | | | | am 93d46952: am 67603c6e: Recreate TextureView\'s display list on attach Bug ...Romain Guy2013-06-271-0/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Recreate TextureView's display list on attachRomain Guy2013-06-271-0/+8
* | | | | | | am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb...Robert Greenwalt2013-06-261-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix power issues around wifi scans.Robert Greenwalt2013-06-261-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | am 9d2b0dbf: am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"John Reck2013-06-251-1/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"John Reck2013-06-251-1/+6
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix deadlock of WebViewCoreThread"John Reck2013-06-251-1/+6
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix deadlock of WebViewCoreThreadYuya Aoki2013-05-011-1/+6
| | * | | | Merge "Lockscreen : Reference correct layout"Jean-Baptiste Queru2013-06-241-1/+1
| | |\ \ \ \
| | | * | | | Lockscreen : Reference correct layoutDanesh Mondegarian2013-06-241-1/+1
* | | | | | | am 75c59fb9: am dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr...kmccormick2013-06-211-4/+9
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge "Doc change: new Bluetooth LE doc" into jb-mr2-devkmccormick2013-06-211-4/+9
| |\ \ \ \ \ \
| | * | | | | | Doc change: new Bluetooth LE dockmccormick2013-06-211-4/+9
* | | | | | | | am 94ba190e: am de04dfb6: Merge "some extra docs for TextDirectionHeuristic" ...Scott Main2013-06-172-3/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | some extra docs for TextDirectionHeuristicScott Main2013-06-172-3/+16
* | | | | | | | am c4473d10: am 27a8508e: add attributes reference for splimotionevents and l...Scott Main2013-06-171-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | add attributes reference for splimotionevents and layoutmodeScott Main2013-06-181-0/+4
* | | | | | | | am 1d4cd879: am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/Strin...Dianne Hackborn2013-06-171-15/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."Dianne Hackborn2013-06-171-15/+3
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "Avoid unnecessary FindClass("java/lang/String")."Dianne Hackborn2013-06-181-15/+3
| | |\ \ \ \ \ \
| | | * | | | | | Avoid unnecessary FindClass("java/lang/String").Vladimir Marko2013-06-171-15/+3
* | | | | | | | | am 8fcb169f: am edc3bb66: Disable a flaky test caseXia Wang2013-06-171-0/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Disable a flaky test caseXia Wang2013-06-171-0/+5
* | | | | | | | | am 48fa06f3: am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_...Elliott Hughes2013-06-1774-80/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales"Elliott Hughes2013-06-1774-80/+3
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Correct Date format for el_GR, sv_SE and tr_TR localeshowardb2013-06-1774-80/+3
| | | |/ / / / / | | |/| | | | |