summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | am edc3bb66: Disable a flaky test caseXia Wang2013-06-171-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Disable a flaky test caseXia Wang2013-06-171-0/+5
* | | | | | | | | | | | | | | | | Merge "Handle all text bounds as post-translated"Chris Craik2013-06-172-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Handle all text bounds as post-translatedChris Craik2013-06-172-1/+2
* | | | | | | | | | | | | | | | | | Merge "Don't flip action bar main content and tabs"Adam Powell2013-06-171-17/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Don't flip action bar main content and tabsAdam Powell2013-06-171-17/+1
* | | | | | | | | | | | | | | | | | | Merge "Better handle op size edge cases"Chris Craik2013-06-174-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Better handle op size edge casesChris Craik2013-06-174-5/+10
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am 704dfbfe: am 48fa06f3: am f6a67139: Merge "Correct Date format for el_GR, ...Elliott Hughes2013-06-1774-80/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | 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
| | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Cancel layer update when a layer is about to be destroyed Bug #9310706"Romain Guy2013-06-1710-3/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Cancel layer update when a layer is about to be destroyedRomain Guy2013-06-1710-3/+68
* | | | | | | | | | | | | | | | | Merge "Check for layer renderer in flush"Chris Craik2013-06-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Check for layer renderer in flushChris Craik2013-06-171-1/+2
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Some system apps are more system than others"Christopher Tate2013-06-1716-20/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Some system apps are more system than othersChristopher Tate2013-06-1716-20/+66
* | | | | | | | | | | | | | | | | | Merge "make setHinting(HINTING_ON) kNormal_Hinting"Victoria Lease2013-06-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | make setHinting(HINTING_ON) kNormal_HintingVictoria Lease2013-06-171-1/+1
* | | | | | | | | | | | | | | | | | | Merge "Don't bring stack forward when moving tasks."Craig Mautner2013-06-173-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Don't bring stack forward when moving tasks.Craig Mautner2013-06-173-9/+0
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Lazily allocate seldom-used data structures"Romain Guy2013-06-171-12/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Lazily allocate seldom-used data structuresRomain Guy2013-06-175-61/+109
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-06-1749-0/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-06-1749-0/+95
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Lazily allocate seldom-used data structures"Romain Guy2013-06-174-49/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Lazily allocate seldom-used data structuresRomain Guy2013-06-174-49/+89
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Fix clip merging behavior"Chris Craik2013-06-173-20/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix clip merging behaviorChris Craik2013-06-143-20/+41
* | | | | | | | | | | | | | | | | Merge "Deprecate webview.use_chromium and introduce webview.force_provider."Primiano Tucci2013-06-171-9/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Deprecate webview.use_chromium and introduce webview.force_provider.Primiano Tucci2013-06-171-9/+16
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Complete doDie() before executing addView()."Craig Mautner2013-06-172-29/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Complete doDie() before executing addView().Craig Mautner2013-06-152-29/+45
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "More hideytoast stabilization."John Spurlock2013-06-161-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | More hideytoast stabilization.John Spurlock2013-06-151-0/+8
* | | | | | | | | | | | | | | | am b832dfe7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release -...The Android Open Source Project2013-06-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Temporarily restore some support for icon==0 notifications.Daniel Sandler2013-06-151-2/+4
* | | | | | | | | | | | | | | | | | am 5bc35c7a: (-s ours) am 9e7926f2: am 4a9e4226: (-s ours) Import translation...Baligh Uddin2013-06-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 9e7926f2: am 4a9e4226: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-06-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 4a9e4226: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-06-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-06-1429-58/+29
* | | | | | | | | | | | | | | | | | am bdb795ba: (-s ours) am 2f9807b8: Import translations. DO NOT MERGEBaligh Uddin2013-06-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 2f9807b8: Import translations. DO NOT MERGEBaligh Uddin2013-06-1529-58/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-06-1429-58/+29
| | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-06-1629-58/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-06-1429-58/+29