summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class"Conley Owens2011-04-291-0/+5
|\
| * am 9fd8e057: Merge "Fix memory leak of SkMovie class"Conley Owens2011-04-291-0/+5
| |\
| | * Merge "Fix memory leak of SkMovie class"Conley Owens2011-04-291-0/+5
| | |\
| | | * Fix memory leak of SkMovie classKimiyoshi Kusaka2011-03-281-0/+5
* | | | am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because...Conley Owens2011-04-291-1/+1
|\ \ \ \ | |/ / /
| * | | am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing sea...Conley Owens2011-04-291-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Fix startSearch condition on Dialog, because pressing search key cause...Conley Owens2011-04-291-1/+1
| | |\ \
| | | * | Fix startSearch condition on Dialog, because pressing search key causes ANR p...lge-aosp2011-03-151-1/+1
* | | | | am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in re...Conley Owens2011-04-291-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"Conley Owens2011-04-291-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Adding a sanity test in the while loop in readHistory()"Conley Owens2011-04-291-1/+1
| | |\ \ \
| | | * | | Adding a sanity test in the while loop in readHistory()Per Andersson2011-02-211-1/+1
* | | | | | am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for Pr...Scott Main2011-04-291-13/+75
|\ \ \ \ \ \
| * \ \ \ \ \ am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" in...Scott Main2011-04-291-13/+75
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycombScott Main2011-04-291-13/+75
| | |\ \ \ \ \ \
| | | * | | | | | docs: more documentation for ProgressBarScott Main2011-04-291-13/+75
* | | | | | | | | am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyD...Conley Owens2011-04-291-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am e1787009: Merge "Added null check on return value for getKeyDispatcherStat...Conley Owens2011-04-281-0/+4
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge "Added null check on return value for getKeyDispatcherState()"Conley Owens2011-04-281-0/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Added null check on return value for getKeyDispatcherState()Per Andersson2011-04-281-0/+4
* | | | | | | | | | am 8b22ef66: am e41d2aed: Merge "Using robust equality check."Conley Owens2011-04-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am e41d2aed: Merge "Using robust equality check."Conley Owens2011-04-281-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Using robust equality check."Conley Owens2011-04-281-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Using robust equality check.Jozef BABJAK2011-03-171-1/+1
* | | | | | | | | | | am a9517012: am 1e29552b: Merge "We don\'t need these local references."Conley Owens2011-04-291-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 1e29552b: Merge "We don\'t need these local references."Conley Owens2011-04-281-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "We don't need these local references."Conley Owens2011-04-281-4/+4
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | We don't need these local references.Jozef BABJAK2011-03-171-4/+4
| | | |/ / / / / / / /
* | | | | | | | | | | am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect t...Conley Owens2011-04-291-3/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am da882181: Merge "Eliminating dead code with no other effect than consuming...Conley Owens2011-04-281-3/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Eliminating dead code with no other effect than consuming battery life."Conley Owens2011-04-281-3/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Eliminating dead code with no other effect than consuming battery life.Jozef BABJAK2011-03-171-3/+0
| | | |/ / / / / / / /
| * | | | | | | | | | am a4e7353d: Import revised translations. DO NOT MERGEEric Fischer2011-04-273-12/+12
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-04-273-12/+12
* | | | | | | | | | | am 8f87f838: Merge "Define Protocol class for use with StateMachine" into hon...Irfan Sheriff2011-04-281-0/+37
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Define Protocol class for use with StateMachineIrfan Sheriff2011-04-281-0/+37
* | | | | | | | | | | Fixed bad merge in ViewRoot.java.Conley Owens2011-04-281-1/+0
* | | | | | | | | | | Merge commit '5e3562a5' into mConley Owens2011-04-276-0/+184
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"Conley Owens2011-04-276-2/+190
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "onDetachedFromWindow is called before onAttachedToWindow"Conley Owens2011-04-276-2/+190
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | onDetachedFromWindow is called before onAttachedToWindowMartin Wallgren2011-04-136-2/+190
| * | | | | | | | | | | am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-271-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-271-1/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Remove errant tag terminatorShachar Shemesh2011-04-111-1/+0
* | | | | | | | | | | | | am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if...Jean-Baptiste Queru2011-04-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initial...Jean-Baptiste Queru2011-04-261-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Re-assingning local variable if mStringBlocks was initialized here. NPE is th...Jozef BABJAK2011-04-191-0/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | am 71a556f2: Import revised translations. DO NOT MERGEEric Fischer2011-04-121-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-04-121-3/+3
* | | | | | | | | | | | am ef568c97: Merge "Make new networkAttribute parameter non-optional." into h...Robert Greenwalt2011-04-262-15/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |