summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am 760f0994: am c0f18b9d: am c4c77d63: Merge "Add property for background GC ↵Mathieu Chartier2014-05-151-0/+8
|\ | | | | | | | | | | | | type" * commit '760f0994db69b77d06814194beecaca1de330855': Add property for background GC type
| * am c0f18b9d: am c4c77d63: Merge "Add property for background GC type"Mathieu Chartier2014-05-141-0/+8
| |\ | | | | | | | | | | | | * commit 'c0f18b9d0cce0c140b1274055faabff732f1e27c': Add property for background GC type
| | * am c4c77d63: Merge "Add property for background GC type"Mathieu Chartier2014-05-141-0/+8
| | |\ | | | | | | | | | | | | | | | | * commit 'c4c77d63d889baca2abbdce6326077f0911b279e': Add property for background GC type
| | | * Add property for background GC typeMathieu Chartier2014-05-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To disable background compaction do: adb shell setprop dalvik.vm.backgroundgctype CMS To enable: adb shell setprop dalvik.vm.backgroundgctype SS Change-Id: I1d87b95fceaedac4df5ce6e718d7c14b35d524cc
* | | | Merge "Fix layout positioning for Toolbar"Adam Powell2014-05-141-9/+11
|\ \ \ \
| * | | | Fix layout positioning for ToolbarAdam Powell2014-05-141-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug where the starting position was not properly updated for the previous view's measured width. Bug 14900794 Change-Id: I6064c5353abc83159cd4c7d6ccfce64640735791
* | | | | Merge "Add a new resource for HDMI-CEC logical device type definition"Jinsuk Kim2014-05-142-0/+14
|\ \ \ \ \
| * | | | | Add a new resource for HDMI-CEC logical device type definitionJinsuk Kim2014-05-132-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New integer array containing the list of HDMI-CEC logical device types which the Android system can host. HdmiControlService gets initialized with the types given in the list. Change-Id: Ic6f02e0903814811b9d1a40364a78b8170d8481d
* | | | | | Merge "Fix reboot loop due to NPE."Sreeram Ramachandran2014-05-141-0/+2
|\ \ \ \ \ \
| * | | | | | Fix reboot loop due to NPE.Sreeram Ramachandran2014-05-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All that's old is new again: http://ag/63748. Change-Id: I83df48447dbcb7f6edf02bd07abf721b009afa49
* | | | | | | merge master nova by hand, skipped translationsEd Heyl2014-05-1456-2905/+609
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb
| * | | | | | am 9fca9ecb: Merge "notification ranking infrastructure"Chris Wren2014-05-1210-471/+156
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9fca9ecbf966372d42210f229005de43bf2d3159': notification ranking infrastructure
| * \ \ \ \ \ \ am 05400140: Merge "Fix magnitude of AbsListView nested scrolling offset"Yorke Lee2014-05-121-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '054001406952e6192508ab68f702ce2be2e4f7b2': Fix magnitude of AbsListView nested scrolling offset
| * \ \ \ \ \ \ \ am 2fbcff12: Merge "First pass on multinetwork framework"Robert Greenwalt2014-05-126-0/+115
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2fbcff12a6e8413f5dcab1cc591573dcb88dd588': First pass on multinetwork framework
| * \ \ \ \ \ \ \ \ am 9a273b89: Merge "Support for hollow switch and seek bar thumbs"Alan Viverette2014-05-1223-118/+239
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a273b899c9df6395068303d847d79ebcb45bc17': Support for hollow switch and seek bar thumbs
| * \ \ \ \ \ \ \ \ \ am 5efd55a1: Merge "Fix nested scrolling bugs in AbsListView"Yorke Lee2014-05-121-10/+13
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5efd55a1be4440efb47c28a776f9c3626a889a85': Fix nested scrolling bugs in AbsListView
| * \ \ \ \ \ \ \ \ \ \ am bf857065: Merge "Support multiple calls to AsyncChannel.disconnect"Robert Greenwalt2014-05-121-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bf857065afa38bb55b370a6b4e38b4703d22376d': Support multiple calls to AsyncChannel.disconnect
| * \ \ \ \ \ \ \ \ \ \ \ am 964ba838: Remove an unused member.Yohei Yukawa2014-05-121-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '964ba83885e255254263435daa56b4f20f8319dd': Remove an unused member.
| * \ \ \ \ \ \ \ \ \ \ \ \ am 7b7d5e43: Merge "New, inkier EdgeEffect visual style"Adam Powell2014-05-115-170/+138
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b7d5e4347ca9f7cddbec07cea752756f8c1ac47': New, inkier EdgeEffect visual style
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am d4de9b44: Merge "Adding shell command execution to UiAutomation."Svetoslav2014-05-113-2/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4de9b446ece4f4bdf16e05bb72bc5bb0199c9ae': Adding shell command execution to UiAutomation.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am faf2e7ff: Merge "Revert "Remove the View#initializeScrollbars API""Adam Powell2014-05-101-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'faf2e7ffa99643144db4a3857e002e6ad31be355': Revert "Remove the View#initializeScrollbars API"
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 82902c45: Merge "Remove the View#initializeScrollbars API"Adam Powell2014-05-101-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82902c457f76971763758c67d5ef6068d9069239': Remove the View#initializeScrollbars API
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5b1a0a46: Merge "Fixing crash in Activity.onApplyTheme()."Winson Chung2014-05-091-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b1a0a46a125d1e2f4c469a964feac5321f6e933': Fixing crash in Activity.onApplyTheme().
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ed517771: Merge changes I5d21645b,I8928e357Winson Chung2014-05-091-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed517771f4b6a6e59f49dee56ae21e7b95c6fa99': Fixing NPE in accessing theme attribute. Better transition between excluded-from-recent applications to recents.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2d3af881: Merge "Refactor VirtualLightRefBase & JNI"John Reck2014-05-097-43/+118
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d3af881e9d38b418c1037e9e8e07dbd8580f990': Refactor VirtualLightRefBase & JNI
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1668b19d: Merge "Battery stats tweaks."Dianne Hackborn2014-05-092-122/+179
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1668b19d4ce7361144a6668b52434508d8311ab2': Battery stats tweaks.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6b2350ac: Merge "WindowManagerService: add some defensive checks"Kenny Root2014-05-091-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b2350ac016277b0cd57bda11e6137ecef34bf8f': WindowManagerService: add some defensive checks
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f37bec2b: Merge "Cleanup remainings of old webview."Selim Gurun2014-05-092-29/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f37bec2bcce152f9cc787d508dd3c480f712a5e9': Cleanup remainings of old webview.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 45bd0b7b: Merge "Fix Bitmap.cpp line endings"Chris Craik2014-05-091-837/+837
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '45bd0b7ba311c3f8bf1ebab8cce10c26f21a7a0b': Fix Bitmap.cpp line endings
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2a894fed: Merge "Display: Brightness: Low power mode scales the ↵Ruchi Kandoi2014-05-091-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | brightness to 50 percent." * commit '2a894fedba24b816ed930c55f28e857990f6806a': Display: Brightness: Low power mode scales the brightness to 50 percent.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 02701776: Merge "resolved conflicts for merge of 88aa8aab to master"Vinod Krishnan2014-05-096-20/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '027017768fb1e75aa1c5e1b4a0344b9a4b12c4e0': Adding a margin for the AlertDialog to work on circular UI.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9f4c7f31: Animated state transition drawableAlan Viverette2014-05-09133-21/+252
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f4c7f31b47680973e4e2a23f09e4d5281a40ed0': Animated state transition drawable
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f1f778e6: Merge "Fix misaligned vectors. #cannotunsee"Dan Sandler2014-05-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1f778e698db54d867ef201d260c2042ec0afc94': Fix misaligned vectors. #cannotunsee
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 91325444: Merge "Camera2: Minor update for exposureCompensation spec"Yin-Chia Yeh2014-05-092-2/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91325444a1d7c9de947ee055ddfbac9316117234': Camera2: Minor update for exposureCompensation spec
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 87bf3b28: Merge "Introduce persistent forms of Activity lifecycle calls."Craig Mautner2014-05-097-70/+278
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '87bf3b28f3b94464384c8f6adb7867233c960543': Introduce persistent forms of Activity lifecycle calls.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d8bbf999: Merge "Fix badness from proxy refactoring."Jason Monk2014-05-091-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8bbf9994979e17c18f65b4e4ae3231187f1e3a5': Fix badness from proxy refactoring.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f25ec68c: am a08771ed: am fa75ff62: am b76bc8e0: am 6940b664: Add ↵Mikhail Naganov2014-05-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EventLog event for logging of attempts to call java.lang.Object.getClass * commit 'f25ec68c973bdd6cd78f2b592a5f756219e0a4b7': Add EventLog event for logging of attempts to call java.lang.Object.getClass
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1be633f9: Allow setting password restrictions from a managed profile.Jessica Hummel2014-05-091-25/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1be633f96798cc86be644ab0952e6449464c9860': Allow setting password restrictions from a managed profile.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b1786021: Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATIONBen Murdoch2014-05-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b17860213f101a17f95d2ca95dce7171dd62bf6a': Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e6d58c4c: Merge "Introduce new API for floating window support"Yohei Yukawa2014-05-0912-13/+1217
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6d58c4ce6dedc082cbc13aa494e793a78022aa6': Introduce new API for floating window support
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 690022d1: Merge "Add api for getting the parent of a profile."Jessica Hummel2014-05-092-3/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '690022d14be0251b6e618b01e3f448cb49e61241': Add api for getting the parent of a profile.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b87cf3a0: Bump the batterystats checkin stats version number.Ashish Sharma2014-05-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b87cf3a06618d67ec37a299a385f80466b72d9bd': Bump the batterystats checkin stats version number.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 86d53d01: Merge "Temporarily remove the dpad keys from system keys."Michael Wright2014-05-091-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '86d53d0107e829c537490c97700397452c728556': Temporarily remove the dpad keys from system keys.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5aa45ef5: Merge "HCE/SE foreground support."Martijn Coenen2014-05-085-12/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5aa45ef5ce6725638425aeeec29ac456f326d4c9': HCE/SE foreground support.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a1da4e35: Merge "Add hidden support for ENCODING_PCM_FLOAT to AudioTrack"Glenn Kasten2014-05-081-3/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1da4e35ff7a0651cff96ec5dbebd6a4bb160383': Add hidden support for ENCODING_PCM_FLOAT to AudioTrack
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 12c9e3a0: Merge "Removing the old tasks on launching recents task if they ↵Winson Chung2014-05-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trigger a new task." * commit '12c9e3a00bf912167d1c40a356d19301c93bfdd0': Removing the old tasks on launching recents task if they trigger a new task.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 60549e20: Merge "Usage stats!"Dianne Hackborn2014-05-0810-118/+528
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '60549e202fd57679b0ead98224264c3308106ebd': Usage stats!
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 59969600: Merge "Add android.hardware.camera.external feature."Eino-Ville Talvala2014-05-081-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '599696000400582773dcff7b6142b603ef68ec6b': Add android.hardware.camera.external feature.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a026d635: PrintManager should not crash if print fueature is not available.Svetoslav2014-05-081-9/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a026d63594fafaae046ec97dede2a6a3ed961e66': PrintManager should not crash if print fueature is not available.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3bd2ec0f: Merge "DevicePolicyManager Authentication for Lock Task"justinzhang2014-05-082-0/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3bd2ec0f88c4c52ba6470c8b1d06b85ac39c3adc': DevicePolicyManager Authentication for Lock Task