Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerb... | Nick Pelly | 2011-01-21 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread | Nick Pelly | 2011-01-18 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Fix javadoc which broke build. | Nick Pelly | 2011-01-18 | 1 | -1/+1 | |
* | | | | | | | | | | | am 32064b67: am c4cc3ea4: Merge "Temporary Changes for certification of SCO."... | Jaikumar Ganesh | 2011-01-21 | 2 | -0/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb | Jaikumar Ganesh | 2011-01-21 | 2 | -0/+22 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge "Temporary Changes for certification of SCO." into honeycomb | Jaikumar Ganesh | 2011-01-21 | 2 | -0/+22 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Temporary Changes for certification of SCO. | Jaikumar Ganesh | 2011-01-21 | 2 | -0/+22 | |
* | | | | | | | | | | | am a4f26c3d: am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeou... | Nick Pelly | 2011-01-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (d... | Nick Pelly | 2011-01-21 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)."... | Nick Pelly | 2011-01-18 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerb... | Nick Pelly | 2011-01-18 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | hange the default IsoDep timeout to 300ms (docs update). | Martijn Coenen | 2011-01-18 | 1 | -1/+1 | |
* | | | | | | | | | | | | am 80f3376b: am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccu... | Mathias Agopian | 2011-01-21 | 1 | -3/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged a... | Mathias Agopian | 2011-01-21 | 1 | -3/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports ac... | Mathias Agopian | 2011-01-18 | 1 | -3/+26 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNR... | Mathias Agopian | 2011-01-18 | 1 | -3/+26 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE | Mathias Agopian | 2011-01-16 | 1 | -3/+26 | |
| | * | | | | | | | | | | | am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into ... | Jeff Brown | 2011-01-18 | 1 | -1/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread | Jeff Brown | 2011-01-18 | 1 | -1/+8 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | | | Filter virtual keys after touches. (DO NOT MERGE) | Jeff Brown | 2011-01-11 | 1 | -1/+8 | |
| | * | | | | | | | | | | | am 069e810c: Merge "Fixing memory leak in PreferenceScreen." | Brad Fitzpatrick | 2011-01-18 | 1 | -3/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge "Fixing memory leak in PreferenceScreen." | Brad Fitzpatrick | 2011-01-18 | 1 | -3/+8 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Fixing memory leak in PreferenceScreen. | Mathias Jeppsson | 2011-01-18 | 1 | -3/+8 | |
* | | | | | | | | | | | | | | | am 48617a51: am b5e5b2d9: Merge "Tapping inside an EditText should always pop... | Gilles Debunne | 2011-01-21 | 1 | -17/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME."... | Gilles Debunne | 2011-01-21 | 1 | -17/+42 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge "Tapping inside an EditText should always pop up the IME." into honeycomb | Gilles Debunne | 2011-01-21 | 1 | -17/+42 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Tapping inside an EditText should always pop up the IME. | Gilles Debunne | 2011-01-21 | 1 | -17/+42 | |
| | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | am 610dff54: am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_R... | Amith Yamasani | 2011-01-21 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." ... | Amith Yamasani | 2011-01-21 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb | Amith Yamasani | 2011-01-21 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Set the default state of NOTIFICATIONS_USE_RING_VOLUME. | Amith Yamasani | 2011-01-20 | 1 | -1/+0 | |
* | | | | | | | | | | | | | | | | am b2b83077: am debb5bbe: Merge "Add public API for on screen zoom controls" ... | Michael Kolb | 2011-01-21 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb | Michael Kolb | 2011-01-21 | 1 | -2/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | Merge "Add public API for on screen zoom controls" into honeycomb | Michael Kolb | 2011-01-21 | 1 | -2/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | Add public API for on screen zoom controls | Michael Kolb | 2011-01-21 | 1 | -2/+0 | |
| | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | am 8a82de2f: am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redunda... | Brad Fitzpatrick | 2011-01-21 | 1 | -8/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | am 4bb180d6: am ded2b006: Merge "frameworks/base: remove redundant code in Wi... | Brad Fitzpatrick | 2011-01-21 | 1 | -8/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager" | Brad Fitzpatrick | 2011-01-18 | 1 | -8/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | frameworks/base: remove redundant code in WindowManager | Vairavan Srinivasan | 2011-01-18 | 1 | -8/+0 | |
| | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | am ed0c705f: am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly(). | Martijn Coenen | 2011-01-21 | 1 | -12/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly(). | Martijn Coenen | 2011-01-21 | 1 | -12/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | am 07e6f616: Check NDEF before calling makeReadOnly(). | Martijn Coenen | 2011-01-18 | 1 | -12/+17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Check NDEF before calling makeReadOnly(). | Martijn Coenen | 2011-01-18 | 1 | -12/+17 | |
* | | | | | | | | | | | | | | | am ed8bb922: Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plu... | Nick Pelly | 2011-01-21 | 2 | -0/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp" into ... | Nick Pelly | 2011-01-21 | 2 | -0/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 3d06b1e0 to honeycomb-plus-aosp | Nick Pelly | 2011-01-21 | 2 | -0/+33 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | am a701cf85: Implement IsoDep timeout handling (API). | Martijn Coenen | 2011-01-18 | 2 | -0/+33 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | Implement IsoDep timeout handling (API). | Martijn Coenen | 2011-01-18 | 2 | -0/+33 | |
* | | | | | | | | | | | | | | | | am 12871245: am 60130138: Merge "Restart input when the webpage changes the t... | Leon Scroggins | 2011-01-21 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | am 60130138: Merge "Restart input when the webpage changes the text." into ho... | Leon Scroggins | 2011-01-21 | 1 | -1/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |