| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolved conflicts for merge of e2aa0490 to master | Dianne Hackborn | 2011-06-09 | 7 | -27/+83 |
| |\ | |||||
| | * | am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode i... | Dianne Hackborn | 2011-06-08 | 7 | -27/+83 |
| | |\ | |||||
| | | * | am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces com... | Dianne Hackborn | 2011-06-08 | 7 | -27/+83 |
| | | |\ | |||||
| | | | * | Work on issue #4518815: Compatibility mode introduces compatibility regressio... | Dianne Hackborn | 2011-06-08 | 7 | -27/+83 |
| * | | | | Merge "WifiWatchdogService refactor" | Irfan Sheriff | 2011-06-09 | 2 | -22/+42 |
| |\ \ \ \ | |||||
| | * | | | | WifiWatchdogService refactor | Isaac Levy | 2011-06-09 | 2 | -22/+42 |
| * | | | | | am 92110af2: am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calcul... | Jeff Brown | 2011-06-09 | 2 | -2/+6 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4... | Jeff Brown | 2011-06-08 | 2 | -2/+6 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into ... | Jeff Brown | 2011-06-08 | 2 | -2/+6 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | | * | | Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 | Jeff Brown | 2011-06-07 | 2 | -2/+6 |
| | | | |\ \ | |||||
| | | | | * | | Fix swipe gesture cosine calculation. | Jeff Brown | 2011-06-07 | 2 | -2/+6 |
| * | | | | | | am 816e5b72: am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." int... | Dianne Hackborn | 2011-06-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2 | Dianne Hackborn | 2011-06-07 | 1 | -1/+1 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2 | Dianne Hackborn | 2011-06-07 | 1 | -1/+1 |
| | | |\ \ \ \ | | | |/ / / | |||||
| | | | * | | | Merge "Remove compat mode dialog." into honeycomb-mr2 | Dianne Hackborn | 2011-06-07 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| | | | | * | | | Remove compat mode dialog. | Dianne Hackborn | 2011-06-07 | 1 | -1/+1 |
| | * | | | | | | am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO... | Mathias Agopian | 2011-06-07 | 1 | -0/+8 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE) | Mathias Agopian | 2011-06-07 | 1 | -0/+8 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | fix a surface leak introduced by a failed merge (DO NOT MERGE) | Mathias Agopian | 2011-06-07 | 1 | -0/+8 |
| | | | |/ / / | |||||
| * | | | | | | Persist network stats using AtomicFile. | Jeff Sharkey | 2011-06-09 | 3 | -15/+417 |
| * | | | | | | Merge "Fix handling of directory entries" | Christopher Tate | 2011-06-08 | 1 | -14/+42 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix handling of directory entries | Christopher Tate | 2011-06-08 | 1 | -14/+42 |
| * | | | | | | | The service part of the user space VPN support. | Chia-chi Yeh | 2011-06-08 | 5 | -0/+779 |
| * | | | | | | | UsbManager: Clean up extras for ACTION_USB_STATE broadcast | Mike Lockwood | 2011-06-08 | 2 | -26/+6 |
| | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | | Compute range-based usage in NetworkStatsHistory. | Jeff Sharkey | 2011-06-07 | 1 | -3/+16 |
| * | | | | | | UID network stats, secure settings, and random. | Jeff Sharkey | 2011-06-07 | 1 | -57/+188 |
| * | | | | | | Map network identity using ConnectivityService. | Jeff Sharkey | 2011-06-07 | 6 | -146/+458 |
| * | | | | | | Merge "Crash in the TouchExplorer" | Svetoslav Ganov | 2011-06-07 | 1 | -8/+12 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Crash in the TouchExplorer | Svetoslav Ganov | 2011-06-07 | 1 | -8/+12 |
| | |/ / / / / | |||||
| * | | | | | | Merge "Do not register the callbacks in the constructor." | Chia-chi Yeh | 2011-06-07 | 2 | -7/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Do not register the callbacks in the constructor. | Chia-chi Yeh | 2011-05-23 | 2 | -7/+6 |
| * | | | | | | | am e046555b: am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2 | Jeff Brown | 2011-06-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | | am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | | am 5cb05eea: Merge "Fix build." into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 1 | -2/+2 |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | | * | | | | Merge "Fix build." into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 1 | -2/+2 |
| | | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | | * | | | Fix build. | Jeff Brown | 2011-06-06 | 1 | -2/+2 |
| * | | | | | | | am 55cc25c1: am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. B... | Jeff Brown | 2011-06-07 | 4 | -188/+19 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" ... | Jeff Brown | 2011-06-06 | 4 | -188/+19 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycom... | Jeff Brown | 2011-06-06 | 4 | -188/+19 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 4 | -188/+19 |
| | | | |\ \ \ \ | | | | |/ / / | |||||
| | | | | * | | | Simplify spot tracking logic. | Jeff Brown | 2011-06-06 | 4 | -188/+19 |
| * | | | | | | | resolved conflicts for merge of 8b2c0014 to master | Jeff Brown | 2011-06-07 | 4 | -186/+203 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into h... | Jeff Brown | 2011-06-06 | 4 | -186/+203 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 4 | -186/+203 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 4 | -186/+203 |
| | | | |\ \ \ \ | | | | |/ / / | |||||
| | | | | * | | | Touch pad improvements. | Jeff Brown | 2011-06-06 | 4 | -186/+203 |
| * | | | | | | | am 5e4d0206: am b400184a: Merge "Handle AsyncChannel disconnect in WifiServic... | Irfan Sheriff | 2011-06-07 | 1 | -1/+13 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honey... | Irfan Sheriff | 2011-06-06 | 1 | -1/+22 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE | Irfan Sheriff | 2011-06-06 | 1 | -1/+22 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Handle AsyncChannel disconnect in WifiService | Irfan Sheriff | 2011-06-06 | 1 | -1/+22 |
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |