Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Add initial API for stylus and mouse buttons." | Jeff Brown | 2011-05-13 | 9 | -389/+648 |
|\ | |||||
| * | Add initial API for stylus and mouse buttons. | Jeff Brown | 2011-05-13 | 9 | -389/+648 |
* | | Merge "Fix audio effect framework issues" | Eric Laurent | 2011-05-13 | 2 | -28/+55 |
|\ \ | |||||
| * | | Fix audio effect framework issues | Eric Laurent | 2011-05-13 | 2 | -28/+55 |
* | | | Merge "resolved conflicts for merge of 0e59729b to master" | Dianne Hackborn | 2011-05-12 | 3 | -76/+338 |
|\ \ \ | |||||
| * \ \ | resolved conflicts for merge of 0e59729b to master | Dianne Hackborn | 2011-05-12 | 3 | -76/+338 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence. | Dianne Hackborn | 2011-05-12 | 3 | -76/+338 |
| | |\ \ | |||||
| | | * \ | am 0f1de9ad: New compat mode front end: UI and persistence. | Dianne Hackborn | 2011-05-12 | 3 | -76/+338 |
| | | |\ \ | |||||
| | | | * | | New compat mode front end: UI and persistence. | Dianne Hackborn | 2011-05-12 | 3 | -76/+338 |
* | | | | | | update for new audio.h header location | Dima Zavin | 2011-05-12 | 4 | -4/+4 |
|/ / / / / | |||||
* | | | | | Extract NetworkManagementService out from Tethering to ConnectivityService. | Chia-chi Yeh | 2011-05-11 | 2 | -111/+54 |
* | | | | | am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp | Jake Hamby | 2011-05-11 | 1 | -8/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp | Jake Hamby | 2011-05-10 | 1 | -8/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | am 4d53cb02: Merge "Enable support for SMS national language shift tables." i... | Jake Hamby | 2011-05-05 | 1 | -8/+3 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge "Enable support for SMS national language shift tables." into gingerbread | Jake Hamby | 2011-05-05 | 1 | -8/+3 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Enable support for SMS national language shift tables. | Jake Hamby | 2011-04-06 | 1 | -8/+3 |
| | * | | | | | | am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8... | Dan Morrill | 2011-05-03 | 1 | -0/+13 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 | Dan Morrill | 2011-05-02 | 1 | -0/+13 |
| | | |/ / / / | |||||
* | | | | | | | am 441bc9a6: am e6848fac: Merge "Fix the adding of host routes." into honeyco... | Robert Greenwalt | 2011-05-11 | 1 | -11/+36 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE | Robert Greenwalt | 2011-05-10 | 1 | -11/+36 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge "Fix the adding of host routes." into honeycomb-LTE | Robert Greenwalt | 2011-05-10 | 1 | -11/+36 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix the adding of host routes. | Robert Greenwalt | 2011-05-10 | 1 | -11/+36 |
* | | | | | | | | Merge "Full local backup infrastructure" | Christopher Tate | 2011-05-11 | 4 | -31/+495 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Full local backup infrastructure | Christopher Tate | 2011-05-10 | 4 | -31/+495 |
* | | | | | | | | | Merge "resolved conflicts for merge of 037b54cf to master" | Dianne Hackborn | 2011-05-11 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | resolved conflicts for merge of 037b54cf to master | Dianne Hackborn | 2011-05-11 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / | |||||
| | * | | | | | | | am 652dbb7d: am 837bdc49: Merge "Fix scaling of batched motion events." into ... | Dianne Hackborn | 2011-05-10 | 1 | -0/+8 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | am 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2 | Dianne Hackborn | 2011-05-10 | 1 | -0/+8 |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | / / | | | | | |_|/ / | | | | |/| | | | |||||
| | | | * | | | | Fix scaling of batched motion events. | Dianne Hackborn | 2011-05-09 | 1 | -0/+8 |
* | | | | | | | | Merge changes I21e9629e,I535ed3ba | Daniel Sandler | 2011-05-11 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | It's lights out for you, navigation bar! | Daniel Sandler | 2011-05-11 | 1 | -0/+5 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge "Use canonical paths to compare library directory with data directory." | Amith Yamasani | 2011-05-10 | 1 | -30/+36 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Use canonical paths to compare library directory with data directory. | Amith Yamasani | 2011-05-10 | 1 | -30/+36 |
* | | | | | | | | resolved conflicts for merge of 05be6d6f to master | Dianne Hackborn | 2011-05-09 | 13 | -82/+341 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling w... | Dianne Hackborn | 2011-05-09 | 13 | -80/+341 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into... | Dianne Hackborn | 2011-05-09 | 13 | -80/+341 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Better compat mode part one: start scaling windows. | Dianne Hackborn | 2011-05-09 | 13 | -80/+341 |
| | | * | | | | DO NOT MERGE MountService: Fix running media scanner at boot. | Mike Lockwood | 2011-05-03 | 1 | -0/+7 |
| | | * | | | | DO NOT MERGE Fix deadlock in MountService | Mike Lockwood | 2011-05-03 | 1 | -17/+32 |
| | | * | | | | DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods | Mike Lockwood | 2011-05-03 | 1 | -0/+13 |
| | | * | | | | DO NOT MERGE MountService: Add support for multiple volumes | Mike Lockwood | 2011-05-03 | 1 | -108/+111 |
* | | | | | | | Fix dumpsys output. | Marco Nelissen | 2011-05-06 | 1 | -1/+3 |
* | | | | | | | Add ability for hierarchyviewer to output displaylist info | Chet Haase | 2011-05-05 | 1 | -1/+1 |
* | | | | | | | Revert "Add ability for hierarchyviewer to output displaylist info" | Chet Haase | 2011-05-04 | 1 | -1/+1 |
* | | | | | | | Merge "Add basic walled garden check" | Irfan Sheriff | 2011-05-04 | 1 | -1/+54 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add basic walled garden check | Irfan Sheriff | 2011-05-03 | 1 | -1/+54 |
* | | | | | | | | Merge "Return NetworkStats bundle from NM service." | Jeff Sharkey | 2011-05-04 | 3 | -10/+106 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Return NetworkStats bundle from NM service. | Jeff Sharkey | 2011-05-04 | 3 | -10/+106 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge "Add ability for hierarchyviewer to output displaylist info" | Chet Haase | 2011-05-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add ability for hierarchyviewer to output displaylist info | Chet Haase | 2011-05-04 | 1 | -1/+1 |