summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerb...Nick Pelly2011-01-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am b735aa0b: Merge "Fix javadoc which broke build." into gingerbreadNick Pelly2011-01-181-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Fix javadoc which broke build.Nick Pelly2011-01-181-1/+1
* | | | | | | | | | | am 32064b67: am c4cc3ea4: Merge "Temporary Changes for certification of SCO."...Jaikumar Ganesh2011-01-212-0/+22
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycombJaikumar Ganesh2011-01-212-0/+22
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Temporary Changes for certification of SCO." into honeycombJaikumar Ganesh2011-01-212-0/+22
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Temporary Changes for certification of SCO.Jaikumar Ganesh2011-01-212-0/+22
* | | | | | | | | | | am a4f26c3d: am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeou...Nick Pelly2011-01-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (d...Nick Pelly2011-01-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)."...Nick Pelly2011-01-181-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerb...Nick Pelly2011-01-181-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | hange the default IsoDep timeout to 300ms (docs update).Martijn Coenen2011-01-181-1/+1
* | | | | | | | | | | | am 80f3376b: am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccu...Mathias Agopian2011-01-211-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged a...Mathias Agopian2011-01-211-3/+26
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports ac...Mathias Agopian2011-01-181-3/+26
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNR...Mathias Agopian2011-01-181-3/+26
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLEMathias Agopian2011-01-161-3/+26
| | * | | | | | | | | | | am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into ...Jeff Brown2011-01-181-1/+8
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbreadJeff Brown2011-01-181-1/+8
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Filter virtual keys after touches. (DO NOT MERGE)Jeff Brown2011-01-111-1/+8
| | * | | | | | | | | | | am 069e810c: Merge "Fixing memory leak in PreferenceScreen."Brad Fitzpatrick2011-01-181-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge "Fixing memory leak in PreferenceScreen."Brad Fitzpatrick2011-01-181-3/+8
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fixing memory leak in PreferenceScreen.Mathias Jeppsson2011-01-181-3/+8
* | | | | | | | | | | | | | | am 48617a51: am b5e5b2d9: Merge "Tapping inside an EditText should always pop...Gilles Debunne2011-01-211-17/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME."...Gilles Debunne2011-01-211-17/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "Tapping inside an EditText should always pop up the IME." into honeycombGilles Debunne2011-01-211-17/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Tapping inside an EditText should always pop up the IME.Gilles Debunne2011-01-211-17/+42
| | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | | am 610dff54: am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_R...Amith Yamasani2011-01-211-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." ...Amith Yamasani2011-01-211-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycombAmith Yamasani2011-01-211-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Set the default state of NOTIFICATIONS_USE_RING_VOLUME.Amith Yamasani2011-01-201-1/+0
* | | | | | | | | | | | | | | | am b2b83077: am debb5bbe: Merge "Add public API for on screen zoom controls" ...Michael Kolb2011-01-211-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycombMichael Kolb2011-01-211-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge "Add public API for on screen zoom controls" into honeycombMichael Kolb2011-01-211-2/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Add public API for on screen zoom controlsMichael Kolb2011-01-211-2/+0
| | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 8a82de2f: am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redunda...Brad Fitzpatrick2011-01-211-8/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redundant code in Wi...Brad Fitzpatrick2011-01-211-8/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"Brad Fitzpatrick2011-01-181-8/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | frameworks/base: remove redundant code in WindowManagerVairavan Srinivasan2011-01-181-8/+0
| | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | | am ed0c705f: am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly().Martijn Coenen2011-01-211-12/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly().Martijn Coenen2011-01-211-12/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 07e6f616: Check NDEF before calling makeReadOnly().Martijn Coenen2011-01-181-12/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Check NDEF before calling makeReadOnly().Martijn Coenen2011-01-181-12/+17
* | | | | | | | | | | | | | | am ed8bb922: Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plu...Nick Pelly2011-01-212-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp" into ...Nick Pelly2011-01-212-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aospNick Pelly2011-01-212-0/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | am a701cf85: Implement IsoDep timeout handling (API).Martijn Coenen2011-01-182-0/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | Implement IsoDep timeout handling (API).Martijn Coenen2011-01-182-0/+33
* | | | | | | | | | | | | | | | am 12871245: am 60130138: Merge "Restart input when the webpage changes the t...Leon Scroggins2011-01-211-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 60130138: Merge "Restart input when the webpage changes the text." into ho...Leon Scroggins2011-01-211-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |