summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "jni: 64-bit compile issue"Mark Salyzyn2014-03-261-5/+6
|\
| * jni: 64-bit compile issueMark Salyzyn2014-03-261-5/+6
|/
* Merge "Note libselinux dependency on packages.list format changes."Nick Kralevich2014-03-261-0/+1
|\
| * Note libselinux dependency on packages.list format changes.Stephen Smalley2014-03-261-0/+1
|/
* Merge "Solve three memory leaks related to PatchCache"Chris Craik2014-03-252-2/+16
|\
| * Solve three memory leaks related to PatchCacheJens Gulin2014-03-252-2/+16
* | Merge "Use X509ExtendedTrustManager and not Conscrypt"Kenny Root2014-03-254-34/+387
|\ \
| * | Use X509ExtendedTrustManager and not ConscryptKenny Root2014-03-244-34/+387
* | | Merge "Don't wait for finishing animation when second display is disconnected"Craig Mautner2014-03-251-2/+7
|\ \ \
| * | | Don't wait for finishing animation when second display is disconnectedKoji Fukui2014-03-251-2/+7
| | |/ | |/|
* | | Merge "Fix scaleNinePatch."Narayan Kamath2014-03-251-1/+1
|\ \ \ | |/ / |/| |
| * | Fix scaleNinePatch.Narayan Kamath2014-03-241-1/+1
| |/
* | Merge "Set ScreenshotSurface secure if any secure content is shown."Craig Mautner2014-03-242-4/+22
|\ \ | |/ |/|
| * Set ScreenshotSurface secure if any secure content is shown.Minoru Aoi2014-03-202-4/+22
* | Merge "Adjust to the change in the private SSLParameterImpl API."Alex Klyubin2014-03-211-2/+2
|\ \
| * | Adjust to the change in the private SSLParameterImpl API.Alex Klyubin2014-03-211-2/+2
|/ /
* | Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"Colin Cross2014-03-201-0/+3
|\ \
| * | bootanimation: build 32-bit if 64-bit gl libraries are not availableColin Cross2014-03-191-0/+3
* | | Merge "Don't register methods when there's nothing to register."Narayan Kamath2014-03-201-11/+1
|\ \ \ | |_|/ |/| |
| * | Don't register methods when there's nothing to register.Narayan Kamath2014-03-191-11/+1
* | | Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"Chris Craik2014-03-201-0/+1
|\ \ \
| * | | Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ONJeanette Löfgren2014-02-151-0/+1
* | | | Merge "Get rid of noise during boot."Nick Kralevich2014-03-201-5/+3
|\ \ \ \
| * | | | Get rid of noise during boot.Dianne Hackborn2014-03-191-5/+3
|/ / / /
* | | | Merge "build app_process64 on 64-bit targets"Colin Cross2014-03-201-0/+22
|\ \ \ \ | | |_|/ | |/| |
| * | | build app_process64 on 64-bit targetsColin Cross2014-03-191-0/+22
|/ / /
* | | Merge "mediaeditor shouldn't depend on audioflinger."Glenn Kasten2014-03-191-1/+0
|\ \ \
| * | | mediaeditor shouldn't depend on audioflinger.Narayan Kamath2014-03-191-1/+0
| | |/ | |/|
* | | Merge "Fix 64 bit compile failures in renderscript"Glenn Kasten2014-03-192-22/+22
|\ \ \
| * | | Fix 64 bit compile failures in renderscriptNarayan Kamath2014-03-192-22/+22
| |/ /
* | | Merge "Allow PMS to restorecon directories under /data."Nick Kralevich2014-03-193-0/+108
|\ \ \
| * | | Allow PMS to restorecon directories under /data.Robert Craig2014-03-193-0/+108
| |/ /
* | | Merge "androidfw: resolve 64-bit build issues"Mark Salyzyn2014-03-196-98/+98
|\ \ \
| * | | androidfw: resolve 64-bit build issuesMark Salyzyn2014-03-196-98/+98
| |/ /
* | | Merge "PacProcessor should be 32 bit only."Glenn Kasten2014-03-191-0/+1
|\ \ \ | |/ / |/| |
| * | PacProcessor should be 32 bit only.Narayan Kamath2014-03-191-0/+1
|/ /
* | Merge "Insufficient ProcessRecord cleanup when persistent process is killed"Dianne Hackborn2014-03-181-0/+1
|\ \
| * | Insufficient ProcessRecord cleanup when persistent process is killedAkira Numata2014-03-181-0/+1
* | | Merge "Pass int32_t for JNI calls to java Input/Output streams."Narayan Kamath2014-03-181-7/+16
|\ \ \ | |/ / |/| |
| * | Pass int32_t for JNI calls to java Input/Output streams.Ashok Bhat2014-03-171-7/+16
* | | Merge "Null pointer exception in FileRotator.java"Jeff Sharkey2014-03-172-1/+19
|\ \ \ | |/ / |/| |
| * | Null pointer exception in FileRotator.javaMikael Gullstrand2014-03-132-1/+19
* | | Merge "Don't attempt to launch disabled activities in smoke test."Steve Moyer2014-03-162-10/+12
|\ \ \
| * | | Don't attempt to launch disabled activities in smoke test.Steve Moyer2014-02-202-10/+12
* | | | Merge "Move options buffers to top scope"Dave Allison2014-03-141-23/+29
|\ \ \ \
| * | | | Move options buffers to top scopeDave Allison2014-03-141-23/+29
|/ / / /
* | | | Merge "remove unnecessary switchUser call"Victoria Lease2014-03-141-0/+3
|\ \ \ \
| * | | | remove unnecessary switchUser callJianzheng Zhou2014-03-131-0/+3
| | |/ / | |/| |
* | | | Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
|\ \ \ \
| * | | | Fix layoutlib build.Narayan Kamath2014-03-141-1/+1
|/ / / /