Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am acbc41d6: Merge "Revert "Workaround apps not calling super.onDetachedFromW... | Bart Sears | 2014-03-06 | 4 | -21/+7 |
|\ | |||||
| * | Merge "Revert "Workaround apps not calling super.onDetachedFromWindow()"" | Bart Sears | 2014-03-06 | 4 | -21/+7 |
| |\ | |||||
| | * | Revert "Workaround apps not calling super.onDetachedFromWindow()" | Bart Sears | 2014-03-06 | 4 | -21/+7 |
* | | | am d621e77c: Merge "Workaround apps not calling super.onDetachedFromWindow()" | John Reck | 2014-03-06 | 4 | -7/+21 |
|\ \ \ | |/ / | |||||
| * | | Merge "Workaround apps not calling super.onDetachedFromWindow()" | John Reck | 2014-03-06 | 4 | -7/+21 |
| |\ \ | | |/ | |||||
| | * | Workaround apps not calling super.onDetachedFromWindow() | John Reck | 2014-03-06 | 4 | -7/+21 |
* | | | am 16340670: Merge "Add a warning about the SSID format in CaptivePortalTrack... | Jeff Davidson | 2014-03-06 | 1 | -0/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge "Add a warning about the SSID format in CaptivePortalTracker." | Jeff Davidson | 2014-03-06 | 1 | -0/+7 |
| |\ \ | |||||
| | * | | Add a warning about the SSID format in CaptivePortalTracker. | Jeff Davidson | 2014-02-07 | 1 | -0/+7 |
* | | | | am b7d0cfa0: Merge "Add Path.isConvex, and force View outlines to be convex" | Chris Craik | 2014-03-06 | 2 | -2/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "Add Path.isConvex, and force View outlines to be convex" | Chris Craik | 2014-03-06 | 2 | -2/+14 |
| |\ \ \ | |||||
| | * | | | Add Path.isConvex, and force View outlines to be convex | Chris Craik | 2014-03-03 | 2 | -2/+14 |
| * | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2014-03-06 | 2 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-03-05 | 2 | -2/+2 |
* | | | | | | am ae2a35ba: am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: ... | Martijn Coenen | 2014-03-06 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessag... | Martijn Coenen | 2014-03-06 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception... | Martijn Coenen | 2014-03-06 | 1 | -0/+2 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge "NFC: getNdefMessage() should throw exception if no tag in field." | Martijn Coenen | 2014-03-06 | 1 | -0/+2 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | NFC: getNdefMessage() should throw exception if no tag in field. | Mathias Jeppsson | 2014-01-28 | 1 | -0/+2 |
* | | | | | | | | | am 97ae5385: Formalize time bases in battery stats. | Dianne Hackborn | 2014-03-06 | 3 | -742/+922 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Formalize time bases in battery stats. | Dianne Hackborn | 2014-03-05 | 3 | -742/+922 |
* | | | | | | | | | am 5ab31155: am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and ... | Griff Hazen | 2014-03-06 | 1 | -4/+40 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to ... | Griff Hazen | 2014-03-06 | 1 | -4/+40 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." int... | Griff Hazen | 2014-03-06 | 1 | -4/+40 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular... | Griff Hazen | 2014-03-06 | 1 | -4/+40 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Add addExtras and getExtras to Notification.Builder. | Griff Hazen | 2014-03-05 | 1 | -4/+40 |
* | | | | | | | | | | | am ecc7ca53: resolved conflicts for merge of fa2e53cc to master | Michael Wright | 2014-03-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | resolved conflicts for merge of fa2e53cc to master | Michael Wright | 2014-03-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese sp... | Michael Wright | 2014-03-06 | 4 | -93/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fa... | Michael Wright | 2014-03-06 | 4 | -93/+1 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys."... | Michael Wright | 2014-03-06 | 4 | -93/+1 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ | am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev | Michael Wright | 2014-03-06 | 4 | -93/+1 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ | Merge "Revert Japanese special case fallback keys." into klp-dev | Michael Wright | 2014-03-06 | 4 | -93/+1 |
| | | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | Revert Japanese special case fallback keys. | Michael Wright | 2014-02-26 | 4 | -93/+1 |
| | * | | | | | | | | | | | | | am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 ... | Fabrice Di Meglio | 2014-03-06 | 1 | -25/+28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.Nul... | Fabrice Di Meglio | 2014-03-06 | 1 | -25/+28 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerExcep... | Fabrice Di Meglio | 2014-03-06 | 1 | -25/+28 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | |||||
| | | | | * | | | | | | | | | | am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at andro... | Fabrice Di Meglio | 2014-03-06 | 1 | -25/+28 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | |||||
| | | | | | * | | | | | | | | | Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.Cal... | Fabrice Di Meglio | 2014-03-06 | 1 | -25/+28 |
| | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | | Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarVi... | Fabrice Di Meglio | 2014-03-05 | 1 | -25/+28 |
| | * | | | | | | | | | | | | | | am cf33fe68: am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 ... | Fabrice Di Meglio | 2014-03-06 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to cha... | Fabrice Di Meglio | 2014-03-06 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text dire... | Fabrice Di Meglio | 2014-03-06 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | |||||
| | | | | * | | | | | | | | | | | am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction program... | Fabrice Di Meglio | 2014-03-06 | 1 | -0/+4 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | |||||
| | | | | | * | | | | | | | | | | Merge "Fix bug #12422326 Unable to change text direction programmatically usi... | Fabrice Di Meglio | 2014-03-06 | 1 | -0/+4 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | | | Fix bug #12422326 Unable to change text direction programmatically using setT... | Fabrice Di Meglio | 2014-03-05 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | | am b50cea02: resolved conflicts for merge of 1569d61f to master | Filip Gruszczyński | 2014-03-06 | 3 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | resolved conflicts for merge of 1569d61f to master | Filip Gruszczyński | 2014-03-05 | 3 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev | Filip Gruszczyński | 2014-03-06 | 3 | -7/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | Merge changes I2104037d,I125c4a00 into klp-modular-dev | Filip Gruszczyński | 2014-03-06 | 3 | -7/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |