| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolved conflicts for merge of fcc4fed3 to master | Narayan Kamath | 2014-05-21 | 4 | -2/+24 |
| |\ | |||||
| | * | am 6fb904bf: Merge "Make power button behavior configurable." into klp-modula... | Jeff Brown | 2014-05-21 | 4 | -2/+24 |
| | |\ | |||||
| | | * | Merge "Make power button behavior configurable." into klp-modular-dev | Jeff Brown | 2014-05-21 | 4 | -2/+24 |
| | | |\ | |||||
| | | | * | Make power button behavior configurable. | Jeff Brown | 2014-05-20 | 4 | -2/+24 |
| * | | | | Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE." | Sander Alewijnse | 2014-05-21 | 1 | -5/+4 |
| |\ \ \ \ | |||||
| | * | | | | Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE. | Sander Alewijnse | 2014-05-20 | 1 | -5/+4 |
| * | | | | | Merge "Hotspot 2.0 framework - add implementation" | Yuhao Zheng | 2014-05-21 | 2 | -6/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Hotspot 2.0 framework - add implementation | Roger Chang | 2014-05-20 | 2 | -6/+6 |
| * | | | | | | Add scan response as an advertising parameter(1/2). | Wei Wang | 2014-05-20 | 3 | -8/+22 |
| * | | | | | | am 08a8c2ca: am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-... | Griff Hazen | 2014-05-21 | 2 | -28/+32 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev | Griff Hazen | 2014-05-21 | 2 | -28/+32 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | | Merge "Fixes to WearableActionExtensions" into klp-modular-dev | Griff Hazen | 2014-05-21 | 2 | -28/+32 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fixes to WearableActionExtensions | Griff Hazen | 2014-05-20 | 2 | -28/+32 |
| * | | | | | | | am 8f120dd6: am 0702786d: Merge "Allow display timeouts to be set in config.x... | Jeff Brown | 2014-05-21 | 2 | -0/+46 |
| |\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | |||||
| | * | | | | | am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp... | Jeff Brown | 2014-05-21 | 2 | -0/+46 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev | Jeff Brown | 2014-05-21 | 2 | -0/+46 |
| | | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | |||||
| | | | * | | Allow display timeouts to be set in config.xml. | Jeff Brown | 2014-05-20 | 2 | -0/+46 |
| * | | | | | Merge "Change visibility of TvInputManager.Session.setSurface()" | Wonsik Kim | 2014-05-21 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Change visibility of TvInputManager.Session.setSurface() | Wonsik Kim | 2014-05-20 | 1 | -1/+2 |
| * | | | | | | Merge "Consider addAction(int action) to possibly be a bit mask" | Kristian Monsen | 2014-05-21 | 1 | -5/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Consider addAction(int action) to possibly be a bit mask | Kristian Monsen | 2014-05-20 | 1 | -5/+4 |
| * | | | | | | | Merge "Fix build." | Lorenzo Colitti | 2014-05-21 | 2 | -6/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix build. | Lorenzo Colitti | 2014-05-20 | 2 | -6/+6 |
| * | | | | | | | | Merge "resolved conflicts for merge of cbe69ec1 to master" | Griff Hazen | 2014-05-20 | 2 | -0/+874 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | resolved conflicts for merge of cbe69ec1 to master | Griff Hazen | 2014-05-20 | 2 | -0/+874 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | | * | | | | | | | am 7ea18e1c: Add wearable notification extensions to frameworks/base. | Griff Hazen | 2014-05-20 | 2 | -0/+874 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | | * | | | | | | Add wearable notification extensions to frameworks/base. | Griff Hazen | 2014-05-20 | 2 | -0/+874 |
| * | | | | | | | | | Merge "Pass along the appOp param to broadcastIntent" | Amith Yamasani | 2014-05-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Pass along the appOp param to broadcastIntent | Amith Yamasani | 2014-05-20 | 1 | -1/+1 |
| * | | | | | | | | | | Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class."" | Andres Morales | 2014-05-20 | 6 | -365/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| | * | | | | | | | | | Revert "Adding INfcUnlockSettings and NfcUnlock interface class." | Andres Morales | 2014-05-20 | 6 | -365/+2 |
| | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge "Clean up Outline API, method on drawable" | Chris Craik | 2014-05-20 | 2 | -16/+38 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| | * | | | | | | | | Clean up Outline API, method on drawable | Chris Craik | 2014-05-20 | 2 | -16/+38 |
| * | | | | | | | | | Merge "Update FingerprintManager API after discussions." | Jim Miller | 2014-05-20 | 1 | -1/+16 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update FingerprintManager API after discussions. | Jim Miller | 2014-05-19 | 1 | -1/+16 |
| * | | | | | | | | | | Merge "Move IP config from WifiConfiguration to IpConfiguration." | Lorenzo Colitti | 2014-05-20 | 3 | -8/+159 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Move IP config from WifiConfiguration to IpConfiguration. | Jaewan Kim | 2014-05-20 | 3 | -8/+159 |
| * | | | | | | | | | | | Merge "Per-user telephony restrictions" | Amith Yamasani | 2014-05-20 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Per-user telephony restrictions | Amith Yamasani | 2014-05-20 | 1 | -0/+11 |
| | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge "Add Device/Profile Owner gated apis for setting/getting blocked packag... | Julia Reynolds | 2014-05-20 | 2 | -0/+66 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Add Device/Profile Owner gated apis for setting/getting blocked packages. | Julia Reynolds | 2014-05-20 | 2 | -0/+66 |
| | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge "Allow device/profile owners to update settings." | Julia Reynolds | 2014-05-20 | 2 | -0/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Allow device/profile owners to update settings. | Julia Reynolds | 2014-05-20 | 2 | -0/+42 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge "Various API review fixes to resources and drawables" | Alan Viverette | 2014-05-20 | 2 | -21/+33 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Various API review fixes to resources and drawables | Alan Viverette | 2014-05-20 | 2 | -21/+33 |
| * | | | | | | | | | | | am 9777fdb7: am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyL... | Jeff Brown | 2014-05-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" | Jeff Brown | 2014-05-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" | Jeff Brown | 2014-05-20 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge "Fix NullException in QwertyKeyListener.KeyDown" | Jeff Brown | 2014-05-20 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | Fix NullException in QwertyKeyListener.KeyDown | Dmitry Tsyganyuk | 2012-08-29 | 1 | -1/+1 |
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |