Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev | Ruben Brunk | 2015-05-20 | 2 | -1/+35 |
|\ | |||||
| * | camera: Add AIDL interface for CameraServiceProxy. | Ruben Brunk | 2015-05-19 | 2 | -1/+35 |
* | | Merge "Allow DO/PO to go back to normal permission state." into mnc-dev | Svet Ganov | 2015-05-20 | 2 | -12/+39 |
|\ \ | |||||
| * | | Allow DO/PO to go back to normal permission state. | Svet Ganov | 2015-05-20 | 2 | -12/+39 |
* | | | Lower fingerprint permission protection level | Jorim Jaggi | 2015-05-20 | 1 | -1/+1 |
* | | | Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mn... | Jorim Jaggi | 2015-05-20 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2) | Jorim Jaggi | 2015-05-19 | 1 | -1/+0 |
* | | | | Merge "Text selection: fix some issues with drag accelerator" into mnc-dev | Mady Mellor | 2015-05-20 | 1 | -65/+50 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Text selection: fix some issues with drag accelerator | Mady Mellor | 2015-05-20 | 1 | -65/+50 |
* | | | | Hide ProviderStatus and Authentication APIs | Brian Attwell | 2015-05-20 | 1 | -0/+4 |
* | | | | Merge "Fix selection handles on older API versions" into mnc-dev | Mady Mellor | 2015-05-20 | 11 | -2/+10 |
|\ \ \ \ | |||||
| * | | | | Fix selection handles on older API versions | Mady Mellor | 2015-05-15 | 11 | -2/+10 |
* | | | | | Merge "AudioFormat: more compressed formats" into mnc-dev | Eric Laurent | 2015-05-20 | 1 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | AudioFormat: more compressed formats | Eric Laurent | 2015-05-19 | 1 | -0/+20 |
* | | | | | | Merge "Reduce wasted buffer allocations" into mnc-dev | John Reck | 2015-05-20 | 2 | -1/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Reduce wasted buffer allocations | John Reck | 2015-05-19 | 2 | -1/+9 |
* | | | | | | | Merge "Fix whitespace in TextureView" into mnc-dev | John Reck | 2015-05-20 | 1 | -74/+74 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix whitespace in TextureView | John Reck | 2015-05-20 | 1 | -74/+74 |
* | | | | | | | | Merge "Fix NPE in setSurfaceTexure" into mnc-dev | John Reck | 2015-05-20 | 1 | -3/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fix NPE in setSurfaceTexure | John Reck | 2015-05-20 | 1 | -3/+7 |
* | | | | | | | | Merge "Deal more gracefully with null smallIcons." into mnc-dev | Dan Sandler | 2015-05-20 | 1 | -3/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Deal more gracefully with null smallIcons. | Dan Sandler | 2015-05-20 | 1 | -3/+10 |
* | | | | | | | | | Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev | Paul Jensen | 2015-05-20 | 1 | -6/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Undeprecate android.net.ProxyInfo as it's still used. | Paul Jensen | 2015-05-19 | 1 | -6/+0 |
* | | | | | | | | | | Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev | Andrei Stingaceanu | 2015-05-20 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Landscape extracted mode - floating toolbar interference | Andrei Stingaceanu | 2015-05-20 | 1 | -0/+18 |
* | | | | | | | | | | | Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev | Erik Kline | 2015-05-20 | 7 | -41/+148 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Set NLM_F_ACK in our RTM_NEWNEIGH requests | Erik Kline | 2015-05-20 | 7 | -41/+148 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge "Add a hidden method to clear the capabilities of a NetworkRequest" int... | Lorenzo Colitti | 2015-05-20 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add a hidden method to clear the capabilities of a NetworkRequest | Lorenzo Colitti | 2015-05-20 | 1 | -0/+12 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Close netlink socket when shutting down IpReachabilityMonitor | Erik Kline | 2015-05-20 | 2 | -7/+31 |
* | | | | | | | | | | am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpol... | Yigit Boyar | 2015-05-19 | 1 | -4/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Revert "Make VPA.setInterpolator(null) unset the interpolator." | Yigit Boyar | 2015-05-18 | 1 | -4/+11 |
* | | | | | | | | | | | Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev | Wei Wang | 2015-05-19 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | setCallbackType should be public for onlost/onfound apis | Prerepa Viswanadham | 2015-05-19 | 1 | -2/+0 |
* | | | | | | | | | | | | Push initial disk state, handle empty media. | Jeff Sharkey | 2015-05-19 | 1 | -0/+4 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge "Camera2: Fix session close callback" into mnc-dev | Eino-Ville Talvala | 2015-05-19 | 1 | -45/+26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Camera2: Fix session close callback | Eino-Ville Talvala | 2015-05-18 | 1 | -45/+26 |
* | | | | | | | | | | | | Merge "Fix issue #20679383: Add text style to assist.ViewNode..." into mnc-dev | Dianne Hackborn | 2015-05-19 | 3 | -0/+169 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix issue #20679383: Add text style to assist.ViewNode... | Dianne Hackborn | 2015-05-19 | 3 | -0/+169 |
* | | | | | | | | | | | | | Merge "Turning off logging in ALSA device connection routines." into mnc-dev | Paul McLean | 2015-05-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Turning off logging in ALSA device connection routines. | Paul McLean | 2015-05-19 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge "Query HTTP proxy for network via a new API to avoid permissions except... | Paul Jensen | 2015-05-19 | 6 | -24/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Query HTTP proxy for network via a new API to avoid permissions exceptions | Paul Jensen | 2015-05-18 | 6 | -24/+38 |
* | | | | | | | | | | | | | | Merge "Camera2: Add SDK annotations" into mnc-dev | Eino-Ville Talvala | 2015-05-19 | 12 | -73/+188 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Camera2: Add SDK annotations | Eino-Ville Talvala | 2015-05-19 | 12 | -73/+188 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge "Allow creating a managed profile if there is only one user." into mnc-dev | Nicolas Prevot | 2015-05-19 | 2 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Allow creating a managed profile if there is only one user. | Nicolas Prevot | 2015-05-15 | 2 | -0/+17 |
* | | | | | | | | | | | | | | | Merge "Remove controlBackground attribute, replace with direct reference" int... | Alan Viverette | 2015-05-19 | 3 | -15/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Remove controlBackground attribute, replace with direct reference | Alan Viverette | 2015-05-18 | 3 | -15/+8 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |