Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Fix build: Revert "Properly set up local transport data dirs after an ... | Ed Heyl | 2015-03-13 | 1 | -9/+7 |
|\ | |||||
| * | Fix build: Revert "Properly set up local transport data dirs after an initial... | Ed Heyl | 2015-03-13 | 1 | -9/+7 |
* | | Merge "Properly set up local transport data dirs after an initialize operation" | Christopher Tate | 2015-03-13 | 1 | -7/+9 |
|\ \ | |/ | |||||
| * | Properly set up local transport data dirs after an initialize operation | Christopher Tate | 2015-03-12 | 1 | -7/+9 |
* | | Merge "Avoid rebuilding epoll set when PFD status report is done." | Jeff Brown | 2015-03-13 | 1 | -3/+4 |
|\ \ | |||||
| * | | Avoid rebuilding epoll set when PFD status report is done. | Jeff Brown | 2015-03-12 | 1 | -3/+4 |
* | | | Merge "Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""" | Jeff Brown | 2015-03-13 | 1 | -39/+31 |
|\ \ \ | |/ / | |||||
| * | | Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O."" | Jeff Brown | 2015-03-12 | 1 | -39/+31 |
* | | | am 870110e0: am 30fcd2aa: Merge "Drop unusable SELinux APIs." | Nick Kralevich | 2015-03-13 | 1 | -28/+0 |
|\ \ \ | |||||
| * \ \ | am 30fcd2aa: Merge "Drop unusable SELinux APIs." | Nick Kralevich | 2015-03-13 | 1 | -28/+0 |
| |\ \ \ | |||||
| | * | | | Drop unusable SELinux APIs. | Stephen Smalley | 2015-03-13 | 1 | -28/+0 |
* | | | | | Merge "Start moving text measurement into native code" | Raph Levien | 2015-03-13 | 4 | -29/+99 |
|\ \ \ \ \ | |||||
| * | | | | | Start moving text measurement into native code | Raph Levien | 2015-03-13 | 4 | -29/+99 |
* | | | | | | Merge "More work on collecting assist data." | Dianne Hackborn | 2015-03-13 | 21 | -101/+593 |
|\ \ \ \ \ \ | |||||
| * | | | | | | More work on collecting assist data. | Dianne Hackborn | 2015-03-12 | 21 | -101/+593 |
* | | | | | | | Merge "Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN" | Benjamin Franz | 2015-03-13 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN | Benjamin Franz | 2015-03-13 | 1 | -0/+3 |
* | | | | | | | | Merge "Do not hide any call log entries when they are added." | Santos Cordon | 2015-03-13 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Do not hide any call log entries when they are added. | Santos Cordon | 2015-03-12 | 1 | -8/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "Expose isSystemImeThatHasSubtypeOf to Settings" | Yohei Yukawa | 2015-03-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Expose isSystemImeThatHasSubtypeOf to Settings | Yohei Yukawa | 2015-03-13 | 1 | -1/+1 |
* | | | | | | | | | Support a Primary and a Floating ActionMode in DecorView. | Clara Bayarri | 2015-03-13 | 1 | -63/+81 |
* | | | | | | | | | Add a type parameter to startActionMode() calls. | Clara Bayarri | 2015-03-13 | 14 | -132/+374 |
* | | | | | | | | | resolved conflicts for merge of b6b9fe21 to master | Andreas Gampe | 2015-03-13 | 7 | -1904/+0 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker." | Lorenzo Colitti | 2015-03-12 | 7 | -1908/+0 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Merge "Remove dead code, mostly DataStateTracker." | Lorenzo Colitti | 2015-03-12 | 7 | -1908/+0 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Remove dead code, mostly DataStateTracker. | Paul Jensen | 2015-03-11 | 7 | -1908/+0 |
| * | | | | | | | | am cdd3fb5c: Merge "Extracted a separate class to run dexopt on packages" | Andreas Gampe | 2015-03-11 | 2 | -0/+14 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Extracted a separate class to run dexopt on packages | Fyodor Kupolov | 2015-03-11 | 2 | -0/+14 |
* | | | | | | | | | Merge "NetworkStatsService to adjust VPN stats before recording." | Wenchao Tong | 2015-03-13 | 3 | -0/+91 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | NetworkStatsService to adjust VPN stats before recording. | Wenchao Tong | 2015-03-12 | 3 | -0/+91 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Add API for WebView OffscreenPreRaster setting." | Hui Shu | 2015-03-13 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add API for WebView OffscreenPreRaster setting. | Hui Shu | 2015-03-12 | 1 | -0/+21 |
* | | | | | | | | | | resolved conflicts for merge of 42f55d1e to master | Marco Nelissen | 2015-03-12 | 1 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | am a3d25d74: Merge "Fix context leak" | Marco Nelissen | 2015-03-11 | 1 | -3/+8 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Fix context leak | Marco Nelissen | 2015-03-11 | 1 | -3/+8 |
| | | |/ / / / / | | |/| | | | | | |||||
* | | | | | | | | Merge "NetworkStats to support VPN accounting." | Wenchao Tong | 2015-03-12 | 1 | -0/+160 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | NetworkStats to support VPN accounting. | Wenchao Tong | 2015-03-09 | 1 | -0/+160 |
* | | | | | | | | | Merge "Fix negative touch word offset that caused crashing when selecting text" | Roozbeh Pournader | 2015-03-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix negative touch word offset that caused crashing when selecting text | Mady Mellor | 2015-03-12 | 1 | -2/+2 |
* | | | | | | | | | | Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O."" | Jeff Brown | 2015-03-12 | 1 | -31/+39 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Revert "Update ParcelFileDescriptor to use non-blocking I/O." | Jeff Brown | 2015-03-12 | 1 | -31/+39 |
* | | | | | | | | | | Merge "Camera: add @hide API for setting camera rotation" | Yin-Chia Yeh | 2015-03-12 | 3 | -2/+150 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Camera: add @hide API for setting camera rotation | Yin-Chia Yeh | 2015-03-10 | 3 | -2/+150 |
* | | | | | | | | | | Merge "Allow polling for WindowInsets." | Filip Gruszczynski | 2015-03-12 | 2 | -6/+42 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Allow polling for WindowInsets. | Filip Gruszczynski | 2015-03-11 | 2 | -6/+42 |
* | | | | | | | | | | | Move the "Replace" popup option to the Text Selection ActionMode. | Clara Bayarri | 2015-03-12 | 2 | -4/+19 |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge "Add rename support to FingerprintManager" | Jim Miller | 2015-03-12 | 2 | -2/+24 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add rename support to FingerprintManager | Jim Miller | 2015-03-11 | 2 | -2/+24 |
* | | | | | | | | | | Update ParcelFileDescriptor to use non-blocking I/O. | Jeff Brown | 2015-03-11 | 1 | -39/+31 |