Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Revert "Close ActivityView and ActivityContainer cleanly."" | Craig Mautner | 2014-06-13 | 2 | -38/+77 |
* | Do not treat the dummy animation as an animation | Craig Mautner | 2014-06-13 | 2 | -3/+17 |
* | Merge commit '0f3d3dd2' | Qiwen Zhao | 2014-06-13 | 2 | -74/+35 |
|\ | |||||
| * | am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly." | Justin Koh | 2014-06-13 | 2 | -76/+36 |
| |\ | |||||
| | * | Revert "Close ActivityView and ActivityContainer cleanly." | Justin Koh | 2014-06-13 | 2 | -76/+36 |
* | | | Merge "Merge kwd to master" | Wink Saville | 2014-06-12 | 2 | -135/+427 |
|\ \ \ | |||||
| * | | | Merge kwd to master | Wink Saville | 2014-06-13 | 2 | -135/+427 |
* | | | | Don't remove a user already being removed. | Kenny Guy | 2014-06-13 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge "Modifies APIs for retrieving managed profile accounts." | Alexandra Gherghina | 2014-06-10 | 1 | -9/+16 |
|\ \ \ | |||||
| * | | | Modifies APIs for retrieving managed profile accounts. | Alexandra Gherghina | 2014-06-12 | 1 | -9/+16 |
* | | | | Fixed a wrong path to HdmiPortInfo class | Jinsuk Kim | 2014-06-13 | 1 | -2/+2 |
* | | | | resolved conflicts for merge of 4849aa86 to master | Chad Jones | 2014-06-12 | 2 | -3/+16 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am be634951: Fix permission problem and NPE | Craig Mautner | 2014-06-12 | 2 | -2/+16 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix permission problem and NPE | Craig Mautner | 2014-06-12 | 2 | -2/+16 |
* | | | | Merge "Separate Hardware Flp ServiceWatcher flags from the ones used by Softw... | destradaa | 2014-06-10 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Separate Hardware Flp ServiceWatcher flags from the ones used by Software Flp. | destradaa | 2014-06-12 | 1 | -2/+2 |
* | | | | | RoutingControlAction for HdmiControlService | Jinsuk Kim | 2014-06-12 | 5 | -15/+408 |
* | | | | | Merge "Do not display unsecure windows behind dialogs" | Craig Mautner | 2014-06-12 | 2 | -4/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Do not display unsecure windows behind dialogs | Craig Mautner | 2014-06-12 | 2 | -4/+5 |
* | | | | | | DeviceSelectAction for HdmiControlService | Jinsuk Kim | 2014-06-12 | 8 | -39/+504 |
* | | | | | | am 00768c4d: Merge "JobScheduler blocking main thread." into lmp-preview-dev | Matthew Williams | 2014-06-12 | 2 | -6/+11 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge "JobScheduler blocking main thread." into lmp-preview-dev | Matthew Williams | 2014-06-12 | 2 | -6/+11 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | JobScheduler blocking main thread. | Matthew Williams | 2014-06-12 | 2 | -6/+11 |
* | | | | | | | | am 2d0ab42b: Merge "Apply API Council comments to ConnectivityManager" into l... | Robert Greenwalt | 2014-06-12 | 2 | -7/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev | Robert Greenwalt | 2014-06-12 | 2 | -7/+6 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Apply API Council comments to ConnectivityManager | Robert Greenwalt | 2014-06-11 | 2 | -7/+6 |
* | | | | | | | | am 50ece5ec: am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy ... | Nick Kralevich | 2014-06-12 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles." | Nick Kralevich | 2014-06-12 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add service_contexts to policy update bundles. | Riley Spahn | 2014-06-12 | 1 | -1/+8 |
* | | | | | | | | | Merge "Fix backwards compatibility for introspected windows." | Svetoslav | 2014-06-11 | 5 | -68/+132 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix backwards compatibility for introspected windows. | Svetoslav | 2014-06-12 | 5 | -68/+132 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Allow device owner to configure secondary users" | Jason Monk | 2014-06-12 | 1 | -2/+47 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Allow device owner to configure secondary users | Jason Monk | 2014-06-12 | 1 | -2/+47 |
* | | | | | | | | | | Merge "Guest user first iteration" | Amith Yamasani | 2014-06-12 | 1 | -42/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Guest user first iteration | Amith Yamasani | 2014-06-12 | 1 | -42/+0 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | am e2f6373c: Merge "Heads-up notifications for low battery warnings." into lm... | John Spurlock | 2014-06-12 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev | John Spurlock | 2014-06-10 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Heads-up notifications for low battery warnings. | John Spurlock | 2014-06-11 | 1 | -0/+13 |
| * | | | | | | | | | Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev | Robert Greenwalt | 2014-06-10 | 3 | -8/+8 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Minor changes to the LinkAddress API docs. | Lorenzo Colitti | 2014-06-11 | 3 | -8/+8 |
| * | | | | | | | | | | Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev | Robert Greenwalt | 2014-06-11 | 3 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Add a new IpPrefix class and use it in RouteInfo. | Sreeram Ramachandran | 2014-06-11 | 3 | -7/+7 |
| | | |/ / / / / / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-pr... | Robert Greenwalt | 2014-06-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev | Robert Greenwalt | 2014-06-11 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Make NetworkCapabilities publicly immutable. | Robert Greenwalt | 2014-06-11 | 1 | -2/+2 |
| | |/ / / / / / / / / | |||||
* | | | | | | | | | | | am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs... | RoboErik | 2014-06-12 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-pr... | RoboErik | 2014-06-11 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | b/15330955 Make RemoteController use the new session APIs | RoboErik | 2014-06-11 | 1 | -0/+5 |
* | | | | | | | | | | | am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightl... | Christopher Tate | 2014-06-12 | 1 | -8/+18 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge "Relax duplicate-permission-definition constraints slightly" into lmp-p... | Christopher Tate | 2014-06-11 | 1 | -8/+18 |
| |\ \ \ \ \ \ \ \ \ |