Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 5c44c51c: Merge "Use new DisplayManager flag to show own content only." in... | Craig Mautner | 2014-01-14 | 1 | -2/+2 |
|\ | |||||
| * | Merge "Use new DisplayManager flag to show own content only." into klp-modula... | Craig Mautner | 2014-01-14 | 1 | -2/+2 |
| |\ | |||||
| | * | Use new DisplayManager flag to show own content only. | Craig Mautner | 2014-01-13 | 1 | -2/+2 |
| * | | am 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locat... | Daniel Cashman | 2014-01-13 | 1 | -0/+5 |
| |\ \ | |||||
| | * \ | am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when loc... | Daniel Cashman | 2014-01-13 | 1 | -0/+5 |
| | |\ \ | |||||
| | | * \ | am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location provide... | Daniel Cashman | 2014-01-13 | 1 | -0/+5 |
| | | |\ \ | |||||
| | | | * | | Clear cached locations when location providers disabled | David Christie | 2014-01-06 | 1 | -0/+5 |
* | | | | | | am 38c65b1f: am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "Mount... | Jeff Sharkey | 2014-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService liste... | Jeff Sharkey | 2014-01-13 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService listeners can not ... | Jeff Sharkey | 2014-01-13 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" | Jeff Sharkey | 2014-01-13 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge "MountService listeners can not be unregistered" | Jeff Sharkey | 2014-01-13 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| | | | | * | | | MountService listeners can not be unregistered | Niklas Brunlid | 2013-12-18 | 1 | -1/+1 |
* | | | | | | | | am cf6e0d68: Merge "Add display synchronously." into klp-modular-dev | Craig Mautner | 2014-01-13 | 2 | -11/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Add display synchronously." into klp-modular-dev | Craig Mautner | 2014-01-13 | 2 | -11/+9 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add display synchronously. | Craig Mautner | 2014-01-12 | 2 | -33/+17 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
* | | | | | | | | am da9b87a7: am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix v... | Craig Mautner | 2014-01-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of ... | Craig Mautner | 2014-01-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-... | Craig Mautner | 2014-01-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | am 54f99137: am 3747768b: Merge "Fix visibility of multiple non-fullscreen ac... | Craig Mautner | 2014-01-10 | 1 | -1/+1 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | * | | | | Fix visibility of multiple non-fullscreen activities. | riddle_hsu | 2014-01-09 | 1 | -1/+1 |
* | | | | | | | | am d7c97a79: Merge "Remove misleading warnings." into klp-modular-dev | Craig Mautner | 2014-01-10 | 1 | -9/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Remove misleading warnings." into klp-modular-dev | Craig Mautner | 2014-01-10 | 1 | -9/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Remove misleading warnings. | Craig Mautner | 2014-01-10 | 1 | -9/+0 |
| | | |_|_|/ / / | | |/| | | | | | |||||
* | | | | | | | | am 93884a5b: Fix invalid stackId bug. | Craig Mautner | 2014-01-10 | 1 | -22/+8 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fix invalid stackId bug. | Craig Mautner | 2014-01-10 | 1 | -22/+8 |
| |/ / / / / / | |||||
* | | | | | | | resolved conflicts for merge of 4504de5d to master | Craig Mautner | 2014-01-10 | 3 | -22/+111 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Implement ActivityView. | Craig Mautner | 2014-01-10 | 3 | -22/+109 |
* | | | | | | | am 0bb2a4de: Merge "Call moveHomeStack before moving any stack." into klp-mod... | Craig Mautner | 2014-01-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Call moveHomeStack before moving any stack." into klp-modular-dev | Craig Mautner | 2014-01-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Call moveHomeStack before moving any stack. | Craig Mautner | 2014-01-10 | 1 | -2/+2 |
* | | | | | | | | am 22eba28e: Only compile the services jar and so when using mmm | Amith Yamasani | 2014-01-10 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Only compile the services jar and so when using mmm | Amith Yamasani | 2014-01-09 | 1 | -0/+3 |
| * | | | | | | | Include subdirectory Android.mks. | Ying Wang | 2014-01-09 | 2 | -0/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge "Include subdirectory Android.mks." | Ying Wang | 2014-01-09 | 2 | -0/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Include subdirectory Android.mks. | Ying Wang | 2014-01-09 | 2 | -0/+4 |
* | | | | | | | | am b6d9eb87: Merge "Add flag to force public virtual display to show own cont... | Jeff Brown | 2014-01-09 | 3 | -6/+19 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge "Add flag to force public virtual display to show own content." into kl... | Jeff Brown | 2014-01-09 | 3 | -6/+19 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add flag to force public virtual display to show own content. | Jeff Brown | 2014-01-07 | 3 | -6/+19 |
* | | | | | | | | | Merge "Revert "Revert "Move Wifi services to a new git project""" | Vinit Deshpande | 2014-01-08 | 17 | -16237/+4 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Revert "Revert "Move Wifi services to a new git project"" | Vinit Deshpande | 2014-01-08 | 17 | -16237/+4 |
* | | | | | | | | | Merge "b/12068020 Make kb layouts only unique to vendor/product" | RoboErik | 2014-01-08 | 2 | -53/+106 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | b/12068020 Make kb layouts only unique to vendor/product | RoboErik | 2014-01-07 | 2 | -53/+106 |
* | | | | | | | | | | resolved conflicts for merge of 88bfc6dd to master | Craig Mautner | 2014-01-08 | 8 | -174/+273 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge "Extend stack management to other displays." into klp-modular-dev | Craig Mautner | 2014-01-08 | 8 | -174/+273 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Extend stack management to other displays. | Craig Mautner | 2014-01-06 | 8 | -174/+273 |
* | | | | | | | | | | | am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added... | Mike Lockwood | 2014-01-08 | 3 | -30/+157 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB ... | Mike Lockwood | 2014-01-08 | 3 | -30/+157 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descri... | Mike Lockwood | 2014-01-08 | 3 | -30/+157 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields n... | Mike Lockwood | 2014-01-08 | 3 | -30/+157 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | | |