summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of ↵Evan Charlton2014-05-141-1/+1
| | | | | | sendEnvelope." This reverts commit 37384dedab38239433a41641fe87fc3e51bb6976.
* merge master nova by hand, skipped translationsEd Heyl2014-05-141-0/+311
|\ | | | | | | Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb
| * am 9fca9ecb: Merge "notification ranking infrastructure"Chris Wren2014-05-121-1/+9
| |\ | | | | | | | | | | | | * commit '9fca9ecbf966372d42210f229005de43bf2d3159': notification ranking infrastructure
| * \ am 9a273b89: Merge "Support for hollow switch and seek bar thumbs"Alan Viverette2014-05-121-0/+5
| |\ \ | | | | | | | | | | | | | | | | * commit '9a273b899c9df6395068303d847d79ebcb45bc17': Support for hollow switch and seek bar thumbs
| * \ \ am d4accb98: Merge "Define audio attributes"Jean-Michel Trivi2014-05-121-0/+39
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'd4accb989aa92ca16a7806db9bad2425ac81028f': Define audio attributes
| * \ \ \ am 7b7d5e43: Merge "New, inkier EdgeEffect visual style"Adam Powell2014-05-111-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b7d5e4347ca9f7cddbec07cea752756f8c1ac47': New, inkier EdgeEffect visual style
| * \ \ \ \ am d4de9b44: Merge "Adding shell command execution to UiAutomation."Svetoslav2014-05-111-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4de9b446ece4f4bdf16e05bb72bc5bb0199c9ae': Adding shell command execution to UiAutomation.
| * \ \ \ \ \ am 133d4e92: Merge "Fix Os.link apicheck breakage."Elliott Hughes2014-05-101-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '133d4e9291bb62658c6f9bf37ce914578f9d50e7': Fix Os.link apicheck breakage.
| * \ \ \ \ \ \ am faf2e7ff: Merge "Revert "Remove the View#initializeScrollbars API""Adam Powell2014-05-102-8/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'faf2e7ffa99643144db4a3857e002e6ad31be355': Revert "Remove the View#initializeScrollbars API"
| * \ \ \ \ \ \ \ am 82902c45: Merge "Remove the View#initializeScrollbars API"Adam Powell2014-05-102-1/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82902c457f76971763758c67d5ef6068d9069239': Remove the View#initializeScrollbars API
| * \ \ \ \ \ \ \ \ am 53e4004b: Merge "Added MediaCodec.releaseOutputBuffer() method with ↵Lajos Molnar2014-05-091-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | render timestamp" * commit '53e4004becc176288ed3cecdf2d9e22ec4cbf51e': Added MediaCodec.releaseOutputBuffer() method with render timestamp
| * \ \ \ \ \ \ \ \ \ am 9f4c7f31: Animated state transition drawableAlan Viverette2014-05-091-0/+9
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f4c7f31b47680973e4e2a23f09e4d5281a40ed0': Animated state transition drawable
| * \ \ \ \ \ \ \ \ \ \ am 750a2b05: Merge "Unhide AudioTrack support for ENCODING_PCM_FLOAT"Glenn Kasten2014-05-091-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '750a2b05a54612c6ed2aa8796e659b00bf21caa0': Unhide AudioTrack support for ENCODING_PCM_FLOAT
| * \ \ \ \ \ \ \ \ \ \ \ am 87bf3b28: Merge "Introduce persistent forms of Activity lifecycle calls."Craig Mautner2014-05-091-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '87bf3b28f3b94464384c8f6adb7867233c960543': Introduce persistent forms of Activity lifecycle calls.
| * \ \ \ \ \ \ \ \ \ \ \ \ am b1786021: Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATIONBen Murdoch2014-05-091-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b17860213f101a17f95d2ca95dce7171dd62bf6a': Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am e6d58c4c: Merge "Introduce new API for floating window support"Yohei Yukawa2014-05-091-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6d58c4ce6dedc082cbc13aa494e793a78022aa6': Introduce new API for floating window support
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 6a4c12da to master-novaElliott Hughes2014-05-081-0/+670
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I108a86d599b0d692f8d13f8f3d29187db45c6467
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5aa45ef5: Merge "HCE/SE foreground support."Martijn Coenen2014-05-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5aa45ef5ce6725638425aeeec29ac456f326d4c9': HCE/SE foreground support.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 59969600: Merge "Add android.hardware.camera.external feature."Eino-Ville Talvala2014-05-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '599696000400582773dcff7b6142b603ef68ec6b': Add android.hardware.camera.external feature.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3bd2ec0f: Merge "DevicePolicyManager Authentication for Lock Task"justinzhang2014-05-081-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3bd2ec0f88c4c52ba6470c8b1d06b85ac39c3adc': DevicePolicyManager Authentication for Lock Task
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f5a4eabb: Merge "New user restrictions for EDU"Emily Bernier2014-05-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5a4eabbd7531271f523cd326e2b1d0a449b1168': New user restrictions for EDU
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3225a6b5: Further cleaning on animated part of VectorDrawable.ztenghui2014-05-081-56/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3225a6b5b09c8ec78071186bfb20289600812c21': Further cleaning on animated part of VectorDrawable.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 720f52c1: Merge "Unhide AudioTrack.write() method for non-blocking and ↵Jean-Michel Trivi2014-05-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ByteBuffer" * commit '720f52c13af94e73ffcb3156a6e0a9999d017637': Unhide AudioTrack.write() method for non-blocking and ByteBuffer
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7d5cd652: Merge "Add API to disable account management for certain types ↵Sander Alewijnse2014-05-081-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of accounts." * commit '7d5cd65262c9a5735f660e05ce89a02f2d28be14': Add API to disable account management for certain types of accounts.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 20d80a4a: Merge "Quantum notification improvements."Dan Sandler2014-05-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '20d80a4a05249fca9f4aa6c80b61a1f7a9e18dd0': Quantum notification improvements.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a05be305: Merge "Unhide further 1.7-era APIs"Neil Fuller2014-05-081-1/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a05be305825501bdfc7fe812d675cc86d1cae221': Unhide further 1.7-era APIs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6eb4c5bf: Merge "Add flags to context creation for RS"Jason Sams2014-05-081-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6eb4c5bf830c952d70473edff5f2b8e5ab98ce29': Add flags to context creation for RS
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 91c091cf: Merge "State based animators for Views"Alan Viverette2014-05-081-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '91c091cf7b732796d26971de6a508966e24d40a0': State based animators for Views
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f2150734: am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" ↵Vinod Krishnan2014-05-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit 'f215073420706e29305da762fa5f9f53dcf330ff': Adding a HeartRate Feature
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eb440873: Camera: remove some DNG tagsZhijun He2014-05-071-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb44087344cb545f97f78b802dc91bfec252f0f7': Camera: remove some DNG tags
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6e6d1f21: Merge "Make Lock Task API public."Jason Monk2014-05-071-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e6d1f214766bbf00b4b0298d95ec1b42461e470': Make Lock Task API public.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 059637c4: Merge "Make proxy API public"Jason Monk2014-05-071-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059637c4970bdbed19689a5e9ecb40a9ebe5a739': Make proxy API public
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0f4b0ba6: Merge "Add a class for managing Session priority"RoboErik2014-05-071-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f4b0ba6f43bffe68d7e96c6cd78b38406e32c0a': Add a class for managing Session priority
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 13ca0e29: Merge "Add APIs for creating a system priority session and ↵RoboErik2014-05-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getting controllers" * commit '13ca0e29030721f380082bc937f3b1c40d3fc318': Add APIs for creating a system priority session and getting controllers
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d5a99922: Merge "Add attributes and flags for DocCentric."Craig Mautner2014-05-071-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd5a9992273039671f2a7155597cf4150599df761': Add attributes and flags for DocCentric.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e068ba87: Add enableSystemApp methods to DevicePolicyManagerAdam Connors2014-05-071-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e068ba879ea9a712bf7ad6c91e55238f76f122d9': Add enableSystemApp methods to DevicePolicyManager
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5d24ddf3: Add new EDU user restrictions.Julia Reynolds2014-05-071-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d24ddf35e25ad681cf8ec3228c4fa6aca523809': Add new EDU user restrictions.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e3172101: am bfbddcad: am 4f295fe8: Merge "Clean up WindowInsets API for ↵Adam Powell2014-05-071-12/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release" into klp-modular-dev * commit 'e31721019987ba80b00dd5ae1ba7fa2598f566a4': Clean up WindowInsets API for release
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am db62ab87: Revert "Add attributes and flags for DocCentric."Ben Murdoch2014-05-071-9/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db62ab87ca1ce18501e4c8ac9696bc220996d449': Revert "Add attributes and flags for DocCentric."
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5a8c07a2: Add attributes and flags for DocCentric.Craig Mautner2014-05-071-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a8c07a2d2a35169f245908f6916355f09b3ebf4': Add attributes and flags for DocCentric.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1091e2c9: Public WebView permission APITao Bai2014-05-071-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1091e2c9f7f2ee127cf5fc29285c7a7b6cc830f8': Public WebView permission API
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d031e36c: First pass at adding FingerprintManagerServiceJim Miller2014-05-071-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd031e36c433c94fc6da3732be7e61aa906e45ec4': First pass at adding FingerprintManagerService
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 31c0962a: Merge "Fix crash due to texture view callback threading ↵Jeff Brown2014-05-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invariants." * commit '31c0962a2cdb507486507cc96d7b9a214e9849d3': Fix crash due to texture view callback threading invariants.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1b9c2108: Unhide new SSL APIsKenny Root2014-05-061-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b9c2108e8fdd5344e3916259f9d1eb3d2227a50': Unhide new SSL APIs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1bb5da95: Camera2: Add missing capture result tagsZhijun He2014-05-061-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bb5da9543f941430c75e122c8d07a15fa6e2d9e': Camera2: Add missing capture result tags
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7f85f16c: am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" ↵Adam Powell2014-05-061-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit '7f85f16c7d131699bef67aff6a107ce622e65b8d': onWindowDismissed API cleanup
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3439728c: Fix bad merge.Tim Kilbourn2014-05-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3439728cebd6fad754ffcf33ea6d640e6ddc6f87': Fix bad merge.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6824d13d: am f7330ac7: am 989dab11: Update current.txt after hiding isGame.Tim Kilbourn2014-05-061-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6824d13da8ce6c128427f77b4776c991ae51d702': Update current.txt after hiding isGame.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c822b63a: Merge "First step on API cleaning on the VectorDrawable to ↵ztenghui2014-05-061-8/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable animation support" * commit 'c822b63a0b16358a948d21d8ba266b60b8958502': First step on API cleaning on the VectorDrawable to disable animation support
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 168ed3dc: Merge "Cleaning code related to the forwarding intent filters."Nicolas Prevot2014-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '168ed3dc2e36346d227008748fc4c69a0f03d8a5': Cleaning code related to the forwarding intent filters.