summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Burn in protection." into lmp-mr1-modular-devFilip Gruszczynski2015-02-258-1/+306
|\
| * Burn in protection.Filip Gruszczynski2015-02-258-1/+306
| | | | | | | | | | Bug: 19373758 Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
* | Merge "Always draw the circular emulator overlay with square dimensions" ↵Griff Hazen2015-02-251-1/+3
|\ \ | |/ |/| | | into lmp-mr1-modular-dev
| * Always draw the circular emulator overlay with square dimensionsGriff Hazen2015-02-171-1/+3
| | | | | | | | | | | | Bug: 17440607 Change-Id: I37bb99a0185c6269a3a541f0d810c11ff0acfb36
* | Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." ↵Filip Gruszczynski2015-02-256-21/+31
|\ \ | | | | | | | | | into lmp-mr1-modular-dev
| * | Force translucency from windowIsTranslucent on SwipeDismissLayout.Filip Gruszczynski2015-02-246-21/+31
| | | | | | | | | | | | | | | | | | Bug: 18799741 Change-Id: Ifb05869f1bf080d7555d7728dc085c41cc2c277c
* | | am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into ↵Jim Miller2015-02-253-4/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63': Remove TrustAgent whitelisting API
| * \ \ am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-devJim Miller2015-02-253-4/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226': Remove TrustAgent whitelisting API
| | * \ \ Merge "Remove TrustAgent whitelisting API" into lmp-mr1-devJim Miller2015-02-253-4/+2
| | |\ \ \
| | | * | | Remove TrustAgent whitelisting APIJim Miller2015-02-243-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug caught late in the release, this API is broken and should be removed from API 22 because it's too late for a fix and there's no workaround. Bug 19461292 Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
* | | | | | am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-250-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-ub-dev * commit 'bb463806aa9a83d10cfff5f565eebd71d500ae4e': Import translations. DO NOT MERGE
| * | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-devGeoff Mendal2015-02-256-38/+38
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-256-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e5b922995cf7eff9c984735209e2fe073fb5d83 Auto-generated-cl: translation import
* | | | | | | am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-250-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-ub-dev * commit 'c2cbbb89061d45dfe4ec84c3bf5304e76ac6ef64': Import translations. DO NOT MERGE
| * | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-devGeoff Mendal2015-02-251-1/+1
| |\ \ \ \ \ \
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-251-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84339eebbf7a8e2332e85a104b85ec740a25d6f1 Auto-generated-cl: translation import
* | | | | | | am a4f54454: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-250-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a4f544540ebe27aca15305dd8f5bda5b5d10283b': Import translations. DO NOT MERGE
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-252-17/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5974f01d8313faa999068ffd844ecbafb9ab4321 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-256-38/+38
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-256-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I077436f56f383af0746ee1c7037ba8bef0d1d6d6 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-251-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib4c512a4856bdce8518bf1ee1a36ca5fc19a324b Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-252-17/+17
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I14e100832a693f7e5cfa8d53edd90ebb1745c064 Auto-generated-cl: translation import
* | | | | | am 9afbbb2e: am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge ↵Joe Fernandez2015-02-254-50/+77
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "docs: Android for Work developer landing page" into lmp-docs * commit '9afbbb2e600936ef7a402fecd0402a3e59cf864e': docs: Android for Work developer landing page
| * | | | | am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for ↵Joe Fernandez2015-02-254-50/+77
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work developer landing page" into lmp-docs * commit '8ffb574a5087b2099cef5f629568375caa0ddc9c': docs: Android for Work developer landing page
| | * | | | am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work ↵Joe Fernandez2015-02-254-50/+77
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | developer landing page" into lmp-docs * commit 'f7224396ee8416630b9387995a79faae1ee68b7c': docs: Android for Work developer landing page
| | | * \ \ \ am c427b721: am 41418826: Merge "docs: Android for Work developer landing ↵Joe Fernandez2015-02-254-50/+77
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page" into lmp-docs * commit 'c427b721b681b19f40e45ed82ae0c628f3f5b528': docs: Android for Work developer landing page
| | | | * \ \ \ am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docsJoe Fernandez2015-02-254-50/+77
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '414188262311ec48235095a5dec622b24f7e69ef': docs: Android for Work developer landing page
| | | | | * \ \ \ Merge "docs: Android for Work developer landing page" into lmp-docsJoe Fernandez2015-02-254-50/+77
| | | | | |\ \ \ \
| | | | | | * | | | docs: Android for Work developer landing pageJoe Fernandez2015-02-244-50/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a
* | | | | | | | | | am d7cddbd2: am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New ↵Andrew Solovay2015-02-252-1/+345
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc for creating an AfW Work Policy Controller * commit 'd7cddbd2d595cd5ee2cb9e7e05af8a760f265f84': docs: New doc for creating an AfW Work Policy Controller
| * | | | | | | | | am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for ↵Andrew Solovay2015-02-252-1/+345
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creating an AfW Work Policy Controller * commit '7391b0a177f9ecf3c8e3a9657bbf1ae7000ce528': docs: New doc for creating an AfW Work Policy Controller
| | * | | | | | | | am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW ↵Andrew Solovay2015-02-252-1/+345
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work Policy Controller * commit 'e64301e639e73f346a78584af2727bc98f3d81ae': docs: New doc for creating an AfW Work Policy Controller
| | | * | | | | | | am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy ↵Andrew Solovay2015-02-252-1/+345
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Controller * commit '790b1bc864d9066ff691b0e12a4e14ef85566c50': docs: New doc for creating an AfW Work Policy Controller
| | | | * | | | | | am d3cd0948: docs: New doc for creating an AfW Work Policy ControllerAndrew Solovay2015-02-252-1/+345
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3cd0948c8c4662c8711433b756c82fbe2f7a3ad': docs: New doc for creating an AfW Work Policy Controller
| | | | | * | | | | docs: New doc for creating an AfW Work Policy ControllerAndrew Solovay2015-02-242-1/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See first comment for doc stage location. Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415
* | | | | | | | | | am 9ac09b6c: am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge ↵Andrew Solovay2015-02-252-5/+378
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "docs: New "implementing app restrictions" doc" into lmp-docs * commit '9ac09b6c553060d0104aa8fb3f38f4dfd81a8957': docs: New "implementing app restrictions" doc
| * | | | | | | | | am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New ↵Andrew Solovay2015-02-252-5/+378
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "implementing app restrictions" doc" into lmp-docs * commit '93df7f0740a6d2044c29227ac6f684c74aa49ff7': docs: New "implementing app restrictions" doc
| | * | | | | | | | am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app ↵Andrew Solovay2015-02-252-5/+378
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restrictions" doc" into lmp-docs * commit '032e931a806d21d5fa190d1d28f8d65ee0fb4926': docs: New "implementing app restrictions" doc
| | | * | | | | | | am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" ↵Andrew Solovay2015-02-252-5/+378
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc" into lmp-docs * commit '6ffe1058463e5f4e65aa131796b37c0443d1b44b': docs: New "implementing app restrictions" doc
| | | | * | | | | | am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docsAndrew Solovay2015-02-252-5/+378
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a2ae6c9dbffe76bd5bc452fbd85ae92e5e3b9a5c': docs: New "implementing app restrictions" doc
| | | | | * | | | | Merge "docs: New "implementing app restrictions" doc" into lmp-docsAndrew Solovay2015-02-252-5/+378
| | | | | |\ \ \ \ \
| | | | | | * | | | | docs: New "implementing app restrictions" docAndrew Solovay2015-02-242-5/+378
| | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New doc on app restrictions, aimed primarily at developers of enterprise apps. See first comment for doc stage location. Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac
* | | | | | | | | | am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain ↵Chris Craik2015-02-251-2/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | behavior of boundless ripple projection * commit '661b54ae2a55461aa70c07d069550b911c14f800': Explain behavior of boundless ripple projection
| * | | | | | | | am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of ↵Chris Craik2015-02-251-2/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boundless ripple projection * commit '7fc5b5a129a3599c4a213117415e113a85d09745': Explain behavior of boundless ripple projection
| | * | | | | | | am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple ↵Chris Craik2015-02-251-2/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | / / | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | projection * commit 'a9ad0fc793e3479e678441f2ed7abd47994ab74d': Explain behavior of boundless ripple projection
| | | * | | | | am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projectionChris Craik2015-02-251-2/+3
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f': Explain behavior of boundless ripple projection
| | | | * | | | am ea2a0648: Explain behavior of boundless ripple projectionChris Craik2015-02-251-2/+3
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea2a0648a85a059f7235fbae69df87ba511832cf': Explain behavior of boundless ripple projection
| | | | | * | | Explain behavior of boundless ripple projectionChris Craik2015-02-251-2/+3
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab
* | | | | | | Merge "Hold a wake lock while dozing when display updates are pending." into ↵Joe LaPenna2015-02-2410-3/+141
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-modular-dev
generated by cgit v1.1 at 2025-03-30 17:48:19 +0000