summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1Dave Santoro2011-11-171-4/+2
|\
| * Merge "Unhide social stream permissions." into ics-mr1Dave Santoro2011-11-171-4/+2
| |\
| | * Unhide social stream permissions.Dave Santoro2011-11-171-4/+2
* | | am 5397bb52: am 852585c0: Merge "Draw input field focus ring in WebTextView" ...Michael Kolb2011-11-172-4/+51
|\ \ \ | |/ /
| * | Merge "Draw input field focus ring in WebTextView" into ics-mr1Michael Kolb2011-11-172-4/+51
| |\ \
| | * | Draw input field focus ring in WebTextViewMichael Kolb2011-11-172-4/+51
* | | | am 0551287f: am 775e986e: Merge "Fix add single character check" into ics-mr1John Reck2011-11-171-3/+3
|\ \ \ \ | |/ / /
| * | | Merge "Fix add single character check" into ics-mr1John Reck2011-11-171-3/+3
| |\ \ \
| | * | | Fix add single character checkJohn Reck2011-11-161-3/+3
* | | | | am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1John Reck2011-11-171-6/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Undeprecate LayoutAlgorithm" into ics-mr1John Reck2011-11-171-6/+4
| |\ \ \ \
| | * | | | Undeprecate LayoutAlgorithmJohn Reck2011-11-161-6/+4
| | |/ / /
* | | | | am e6269f79: am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1Ben Murdoch2011-11-171-52/+95
|\ \ \ \ \ | |/ / / /
| * | | | Merge changes I59323dc5,I31a01aa3 into ics-mr1Ben Murdoch2011-11-171-52/+95
| |\ \ \ \
| | * | | | WebViewDatabase v11 for ICS.Ben Murdoch2011-11-161-6/+41
| | * | | | Fix a bug in the database upgrade process, and refactor slightly.Ben Murdoch2011-11-161-49/+57
| | |/ / /
* | | | | am e788fa84: am e88ca718: Merge "Hack to workaround the fact that the EGL con...Nicolas Roard2011-11-171-0/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Hack to workaround the fact that the EGL context can be removed from u...Nicolas Roard2011-11-161-0/+15
| |\ \ \ \
| | * | | | Hack to workaround the fact that the EGL context can beNicolas Roard2011-11-161-0/+15
* | | | | | Merge "Add a link from LruCache to the Android support package (compatibility...Jesse Wilson2011-11-171-0/+4
|\ \ \ \ \ \
| * | | | | | Add a link from LruCache to the Android support package (compatibility library).Jesse Wilson2011-11-171-0/+4
* | | | | | | am 37fb92fb: am 302afb93: Merge "Call notifyIncomingA2dpConnection with corre...Matthew Xie2011-11-171-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Call notifyIncomingA2dpConnection with correct rejected status" into i...Matthew Xie2011-11-161-2/+2
| |\ \ \ \ \ \
| | * | | | | | Call notifyIncomingA2dpConnection with correct rejected statusMatthew Xie2011-11-161-2/+2
* | | | | | | | am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take d...Mangesh Ghiware2011-11-174-5/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Revert change to setInitialScale() to take display density into accoun...Mangesh Ghiware2011-11-164-5/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Revert change to setInitialScale() to take display density into account.Mangesh Ghiware2011-11-164-5/+14
* | | | | | | | | am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into i...satok2011-11-171-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Clean up the spell checker framework" into ics-mr1satok2011-11-161-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Clean up the spell checker frameworksatok2011-11-171-1/+2
* | | | | | | | | | am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1Daniel Sandler2011-11-171-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Add a default Dreams component." into ics-mr1Daniel Sandler2011-11-161-0/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add a default Dreams component.Daniel Sandler2011-11-151-0/+3
* | | | | | | | | | | am 3de68918: am e937da83: Merge "Change MediaController look b/5584613" into ...Marco Nelissen2011-11-171-5/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Change MediaController look b/5584613" into ics-mr1Marco Nelissen2011-11-161-5/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Change MediaController lookMarco Nelissen2011-11-161-5/+1
* | | | | | | | | | | | am 9aa6bd1c: am 717a25dc: Add new ManagedEGLContext class to help apps partic...Dianne Hackborn2011-11-172-35/+58
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Add new ManagedEGLContext class to help apps participate in memory trimming.Dianne Hackborn2011-11-162-35/+58
| |/ / / / / / / / / /
| * | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-1648-97/+640
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-1648-97/+640
* | | | | | | | | | | am b3272d29: am de8c5ec8: Merge "IME action (done, next...) correctly handled...Gilles Debunne2011-11-171-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "IME action (done, next...) correctly handled" into ics-mr1Gilles Debunne2011-11-161-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | IME action (done, next...) correctly handledGilles Debunne2011-11-161-1/+3
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge "Fix fix for bug 2816327"Kristian Monsen2011-11-172-3/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix fix for bug 2816327Kristian Monsen2011-11-162-3/+0
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge "When in the Choose Account flow if the accounts list display was initi...Fred Quintana2011-11-161-1/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | When in the Choose Account flow if the accounts list display was initiallyFred Quintana2011-11-151-1/+15
* | | | | | | | | | am 4c0e0dd2: am 3e7497b4: Merge "Eliminate hw.keyboards system properties." i...Jeff Brown2011-11-153-11/+35
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Eliminate hw.keyboards system properties." into ics-mr1Jeff Brown2011-11-153-11/+35
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Eliminate hw.keyboards system properties.Jeff Brown2011-11-153-11/+35