OSDN Git Service
Jason Monk [Tue, 24 Feb 2015 13:23:29 +0000 (13:23 +0000)]
Merge "Move non-ui bt settings code to SettingsLib"
Jason Monk [Tue, 24 Feb 2015 13:16:24 +0000 (13:16 +0000)]
Merge "Some Tethering code to SettingsLib and use in QS"
Narayan Kamath [Tue, 24 Feb 2015 13:09:55 +0000 (13:09 +0000)]
am
287c53f4: am
76507a64: am
72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '
287c53f4a8bade1cb6c2dd2fe858da9c303e3e3d':
Track removal of refcounts from FileMap.
Narayan Kamath [Tue, 24 Feb 2015 13:04:43 +0000 (13:04 +0000)]
am
76507a64: am
72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '
76507a64b530c757dc284f1f4d0807ffbfd9a701':
Track removal of refcounts from FileMap.
Narayan Kamath [Tue, 24 Feb 2015 12:56:52 +0000 (12:56 +0000)]
am
72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '
72dc62ead214bdec5c46d42f4e859b139dba0a00':
Track removal of refcounts from FileMap.
Narayan Kamath [Tue, 24 Feb 2015 12:50:55 +0000 (12:50 +0000)]
Merge "Track removal of refcounts from FileMap."
Narayan Kamath [Tue, 24 Feb 2015 10:28:12 +0000 (10:28 +0000)]
am
fd335f84: am
948682d1: am
6e208cdd: Merge "Remove wrong javadoc comment"
* commit '
fd335f8467259410c0a55733331e10531141e76e':
Remove wrong javadoc comment
Narayan Kamath [Tue, 24 Feb 2015 10:18:39 +0000 (10:18 +0000)]
am
948682d1: am
6e208cdd: Merge "Remove wrong javadoc comment"
* commit '
948682d15f1a4a6676318213a49b50b967cfae27':
Remove wrong javadoc comment
Narayan Kamath [Tue, 24 Feb 2015 10:11:52 +0000 (10:11 +0000)]
am
6e208cdd: Merge "Remove wrong javadoc comment"
* commit '
6e208cddad3315c4e38accdb801908b2b9b5cbbd':
Remove wrong javadoc comment
Narayan Kamath [Tue, 24 Feb 2015 10:04:31 +0000 (10:04 +0000)]
Merge "Remove wrong javadoc comment"
Chad Jones [Tue, 24 Feb 2015 05:17:58 +0000 (21:17 -0800)]
resolved conflicts for merge of
57bb5f5c to master
Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c
Chad Brubaker [Tue, 24 Feb 2015 04:54:41 +0000 (04:54 +0000)]
am
f271fa33: am
cdc70256: am
f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"
* commit '
f271fa33f148b0c410e8ee06aceb1f2b57cd62c7':
Add new IKeystoreService methods to KeyStore
Chad Brubaker [Tue, 24 Feb 2015 04:54:34 +0000 (04:54 +0000)]
am
3576ca1f: am
1629f954: am
598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '
3576ca1f9bd1e46101ad940cc5923ac9965cfafe':
Add Keymaster 0.4 binder API
Deepanshu Gupta [Tue, 24 Feb 2015 04:52:35 +0000 (04:52 +0000)]
am
01d5286f: am
8f022fd3: am
5ed4fc9e: am
99142d29: am
3f8e2b93: am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '
01d5286f388303551a2eb8f57e210f6d7a690cb5':
Set forceFramework correctly for included layouts.
Alan Viverette [Tue, 24 Feb 2015 01:22:16 +0000 (01:22 +0000)]
Merge "Always apply color filter passed to DrawableContainer.setColorFilter"
Alan Viverette [Tue, 24 Feb 2015 01:21:24 +0000 (17:21 -0800)]
Always apply color filter passed to DrawableContainer.setColorFilter
Bug:
19461256
Change-Id: Id44d276739b868e504139cdf767992039f3e4336
Joe LaPenna [Tue, 24 Feb 2015 00:46:48 +0000 (00:46 +0000)]
am
c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev
* commit '
c0c395162ff14b83694158663470ad60e065d9a9':
Hold a wake lock while dozing when display updates are pending.
Joe LaPenna [Tue, 24 Feb 2015 00:37:14 +0000 (00:37 +0000)]
Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev
Chris Craik [Tue, 24 Feb 2015 00:20:05 +0000 (00:20 +0000)]
Merge "Fix atrace saveLayer flag logging"
Chris Craik [Wed, 18 Feb 2015 00:42:36 +0000 (16:42 -0800)]
Fix atrace saveLayer flag logging
Change-Id: I5da85284c15316c9db4cc74011b855ef8c2f7cdd
David Friedman [Mon, 23 Feb 2015 23:03:35 +0000 (23:03 +0000)]
Merge "resolved conflicts for merge of
6248cdd5 to master"
Mike Lockwood [Mon, 23 Feb 2015 23:03:35 +0000 (23:03 +0000)]
Merge "Add MIDI Manager API tweaks:"
Chad Brubaker [Mon, 23 Feb 2015 22:53:07 +0000 (22:53 +0000)]
am
cdc70256: am
f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"
* commit '
cdc70256f47b1797520f2bb5c63b21bd441ed8d9':
Add new IKeystoreService methods to KeyStore
Chad Brubaker [Mon, 23 Feb 2015 22:53:01 +0000 (22:53 +0000)]
am
1629f954: am
598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '
1629f9543a48e93515395a10c50d0394f8be2774':
Add Keymaster 0.4 binder API
Wale Ogunwale [Mon, 23 Feb 2015 22:51:43 +0000 (22:51 +0000)]
Merge "Don't delete home stack when last task is removed."
Chad Brubaker [Mon, 23 Feb 2015 22:45:11 +0000 (22:45 +0000)]
am
f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"
* commit '
f3c117ca0d116b01174732790be1939282d0a5a0':
Add new IKeystoreService methods to KeyStore
Chad Brubaker [Mon, 23 Feb 2015 22:45:01 +0000 (22:45 +0000)]
am
598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '
598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
Add Keymaster 0.4 binder API
David Friedman [Mon, 23 Feb 2015 22:40:41 +0000 (14:40 -0800)]
resolved conflicts for merge of
6248cdd5 to master
Change-Id: I4f7f69c28c90ff4fb8e2db9468d8024162f62c7b
Chris Craik [Mon, 23 Feb 2015 22:39:42 +0000 (22:39 +0000)]
Merge "Simplify Texture member initialization"
Mike Lockwood [Fri, 20 Feb 2015 16:28:47 +0000 (08:28 -0800)]
Add MIDI Manager API tweaks:
- Change the package name from android.midi to android.media.midi
- Add option for specifying a Handler for DeviceCallback notifications
Change-Id: Ia9e9817a651c06299f4e02ee1da3c9666ff64cb9
Chad Brubaker [Mon, 23 Feb 2015 22:20:54 +0000 (22:20 +0000)]
Merge "Add new IKeystoreService methods to KeyStore"
Chad Brubaker [Mon, 23 Feb 2015 22:20:37 +0000 (22:20 +0000)]
Merge "Add Keymaster 0.4 binder API"
Chad Brubaker [Wed, 11 Feb 2015 05:33:23 +0000 (21:33 -0800)]
Add new IKeystoreService methods to KeyStore
Add wrappers for all the new IKeystoreService keymaster 0.4 methods to
android.security.KeyStore.
Change-Id: Icb5500cfffb62d1af326edf326e1b9b67e5cece9
Chad Brubaker [Wed, 21 Jan 2015 22:00:55 +0000 (14:00 -0800)]
Add Keymaster 0.4 binder API
This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.
Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3
Chris Craik [Mon, 23 Feb 2015 21:07:57 +0000 (13:07 -0800)]
Simplify Texture member initialization
Change-Id: Iaaa6dd20e64a0a075d732b101e3c4278cad44047
Alan Viverette [Mon, 23 Feb 2015 20:49:47 +0000 (12:49 -0800)]
Update progress bar and seek bar backgrounds, fix seek bar thumb
Ensures LayerDrawable copies out the correct layer properties during
"tileification". This really needs to be deprecated or replaced in a
future CL, though, because it is potentially lossy (e.g. for
RippleDrawable, which is an instanceof LayerDrawable).
Bug:
19448441
Change-Id: I483e9c34fd781e280c13eb5951f96bc71a252819
Alan Viverette [Mon, 23 Feb 2015 20:38:58 +0000 (20:38 +0000)]
Merge "Unify wrapper-type drawables"
James Cook [Mon, 23 Feb 2015 20:31:13 +0000 (20:31 +0000)]
Merge "Improvements to TextView Ctrl-Z undo support"
James Cook [Tue, 17 Feb 2015 23:00:38 +0000 (15:00 -0800)]
Improvements to TextView Ctrl-Z undo support
* Undo/redo restores cursor position
* Multiple deletes are consolidated into a single operation
* Don't create undo history for invalid or no-op operations
* Move logic for merging operations into Editor.EditOperation
CTS tests in android.widget.cts.TextViewTest will land separately.
Bug:
19332904
Bug:
19450037
Change-Id: I9c7887aecdd0209e783fb7cda4cb7081a97a98cd
Deepanshu Gupta [Mon, 23 Feb 2015 19:29:31 +0000 (19:29 +0000)]
am
8f022fd3: am
5ed4fc9e: am
99142d29: am
3f8e2b93: am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '
8f022fd323063f9cebb481be650db40cf5e486f3':
Set forceFramework correctly for included layouts.
Deepanshu Gupta [Mon, 23 Feb 2015 19:22:31 +0000 (19:22 +0000)]
am
5ed4fc9e: am
99142d29: am
3f8e2b93: am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '
5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c':
Set forceFramework correctly for included layouts.
Mike Lockwood [Mon, 23 Feb 2015 19:21:56 +0000 (19:21 +0000)]
Merge "Add support for USB notification when connected as a MIDI peripheral"
Deepanshu Gupta [Mon, 23 Feb 2015 19:15:57 +0000 (19:15 +0000)]
am
99142d29: am
3f8e2b93: am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '
99142d298213e93f673057c2334b04b38f7e4450':
Set forceFramework correctly for included layouts.
Scott Kennedy [Mon, 23 Feb 2015 19:09:18 +0000 (19:09 +0000)]
Merge "Add some more @Nullable annotations"
Deepanshu Gupta [Mon, 23 Feb 2015 19:09:14 +0000 (19:09 +0000)]
am
3f8e2b93: am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '
3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
Set forceFramework correctly for included layouts.
Deepanshu Gupta [Mon, 23 Feb 2015 19:03:29 +0000 (19:03 +0000)]
am
30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '
30a67cd17af03e53b8be5638f7f70d2989a7cd78':
Set forceFramework correctly for included layouts.
Deepanshu Gupta [Mon, 23 Feb 2015 18:56:27 +0000 (18:56 +0000)]
Merge "Set forceFramework correctly for included layouts." into lmp-dev
David Friedman [Mon, 23 Feb 2015 18:47:38 +0000 (18:47 +0000)]
am
96824427: am
2c689468: am
fcbc8428: am
f066c235: am
18c8a35f: am
8e604689: am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
* commit '
96824427e97ea7ef40777239a537a1c7a60fe15d':
Update Google Play brand-info page. Bug:
18257984
David Friedman [Mon, 23 Feb 2015 18:39:53 +0000 (18:39 +0000)]
am
84e40b1f: am
d77380b8: am
3570268b: am
09e9076d: am
ab0f8ff7: am
88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '
84e40b1f338eba0a352a6bf3a0f2801c21e17d59':
Fixes several typos.
David Friedman [Mon, 23 Feb 2015 18:39:47 +0000 (18:39 +0000)]
am
2c689468: am
fcbc8428: am
f066c235: am
18c8a35f: am
8e604689: am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
* commit '
2c6894685dff6c6f8bbb1af59cf9c8f4acb162c8':
Update Google Play brand-info page. Bug:
18257984
David Friedman [Mon, 23 Feb 2015 18:33:08 +0000 (18:33 +0000)]
am
d77380b8: am
3570268b: am
09e9076d: am
ab0f8ff7: am
88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '
d77380b856050a5d933cbd4cc0ada6192de65f48':
Fixes several typos.
David Friedman [Mon, 23 Feb 2015 18:33:04 +0000 (18:33 +0000)]
am
fcbc8428: am
f066c235: am
18c8a35f: am
8e604689: am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
* commit '
fcbc842878df5fbe3d8a62add407bb512179e28a':
Update Google Play brand-info page. Bug:
18257984
David Friedman [Mon, 23 Feb 2015 18:26:10 +0000 (18:26 +0000)]
am
3570268b: am
09e9076d: am
ab0f8ff7: am
88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '
3570268bcf1e4c375d8b592714f8b7be25819873':
Fixes several typos.
David Friedman [Mon, 23 Feb 2015 18:26:06 +0000 (18:26 +0000)]
am
f066c235: am
18c8a35f: am
8e604689: am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
* commit '
f066c2358d48fdc2ecbc28af99bc8332a3d78ce1':
Update Google Play brand-info page. Bug:
18257984
David Friedman [Mon, 23 Feb 2015 18:20:37 +0000 (18:20 +0000)]
am
09e9076d: am
ab0f8ff7: am
88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '
09e9076ddfd5e9f738cd5096409ff3fb61174803':
Fixes several typos.
David Friedman [Mon, 23 Feb 2015 18:20:32 +0000 (18:20 +0000)]
am
18c8a35f: am
8e604689: am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
* commit '
18c8a35fa4e775c3b515e739b0f32981395914ad':
Update Google Play brand-info page. Bug:
18257984
David Friedman [Mon, 23 Feb 2015 18:13:36 +0000 (18:13 +0000)]
am
ab0f8ff7: am
88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '
ab0f8ff740d314182ccc644f118a7f8ba6c4937e':
Fixes several typos.
David Friedman [Mon, 23 Feb 2015 18:13:32 +0000 (18:13 +0000)]
am
8e604689: am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
* commit '
8e604689c8c8f8ad073e12094991daa712cd8f38':
Update Google Play brand-info page. Bug:
18257984
David Friedman [Mon, 23 Feb 2015 18:06:47 +0000 (18:06 +0000)]
am
88e0145f: Merge "Fixes several typos." into lmp-docs
* commit '
88e0145fb82b6711527ab173e4dc817e3f430708':
Fixes several typos.
David Friedman [Mon, 23 Feb 2015 18:06:43 +0000 (18:06 +0000)]
am
3c26756a: Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
* commit '
3c26756aefae228941588042d677424b54167aa7':
Update Google Play brand-info page. Bug:
18257984
David Friedman [Mon, 23 Feb 2015 18:05:35 +0000 (18:05 +0000)]
Merge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:02:25 +0000 (18:02 +0000)]
Merge "Update Google Play brand-info page. Bug:
18257984" into lmp-docs
Clara Bayarri [Mon, 23 Feb 2015 17:49:43 +0000 (17:49 +0000)]
Merge "Floating toolbars: Encapsulate StandaloneActionMode view creation."
Diego Perez [Mon, 23 Feb 2015 17:28:37 +0000 (17:28 +0000)]
Merge "Avoid caching mImage on the main render loop and use clipping."
Deepanshu Gupta [Mon, 23 Feb 2015 17:18:08 +0000 (09:18 -0800)]
Set forceFramework correctly for included layouts.
Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
Wale Ogunwale [Mon, 23 Feb 2015 17:24:42 +0000 (09:24 -0800)]
Don't delete home stack when last task is removed.
Bug:
19470291
Change-Id: I4a6c24edb6cc83a0f155836ce4e1394807da1563
Geoff Mendal [Mon, 23 Feb 2015 16:53:23 +0000 (16:53 +0000)]
am
c37feed0: (-s ours) am
87809139: (-s ours) am
4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
c37feed0940b0b9b1fdd455c72bc22ae6e579280':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 16:47:35 +0000 (16:47 +0000)]
am
87809139: (-s ours) am
4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
87809139d223ae1e5629590ba7611b9b1da63cbb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 16:41:22 +0000 (16:41 +0000)]
am
4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
4c58f1271d60554375d85598134fdc821563e78a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 16:34:41 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 23 Feb 2015 16:30:07 +0000 (16:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Narayan Kamath [Mon, 23 Feb 2015 15:47:54 +0000 (15:47 +0000)]
Track removal of refcounts from FileMap.
Use delete instead of release.
Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076
Geoff Mendal [Mon, 23 Feb 2015 15:47:09 +0000 (07:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia406db95dc51e21b462e9de8451ad221023447fd
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Feb 2015 15:41:54 +0000 (07:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5b1afb50ecf6cb08b2612edeba53c21d7fdf2ed6
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Feb 2015 15:08:29 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 23 Feb 2015 15:07:26 +0000 (07:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I97bfabc05373b4eeb4f76e00ab88f0b179f91c23
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Feb 2015 14:51:35 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 23 Feb 2015 14:50:26 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: If086d9b20caf8b39a91169d74954f6f21402dec8
Auto-generated-cl: translation import
Selim Cinek [Mon, 23 Feb 2015 14:47:01 +0000 (14:47 +0000)]
Merge "Fixed a crash when drawing the notification background"
Geoff Mendal [Mon, 23 Feb 2015 14:39:07 +0000 (14:39 +0000)]
am
9dd645bd: (-s ours) am
84cd5f64: (-s ours) am
e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
9dd645bdd0512456860a0fec66351dfed966b8c0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:32:42 +0000 (14:32 +0000)]
am
84cd5f64: (-s ours) am
e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
84cd5f64c340067b1a8e3e7a7c7d1e86ca155313':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:32:27 +0000 (14:32 +0000)]
am
0c2de5fa: (-s ours) am
5f28b32c: (-s ours) am
dc82f4ce: (-s ours) Import translations. DO NOT MERGE
* commit '
0c2de5faa50ed01dda4d2ad14666d64e2dd8c9ca':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:27:02 +0000 (14:27 +0000)]
am
5f28b32c: (-s ours) am
dc82f4ce: (-s ours) Import translations. DO NOT MERGE
* commit '
5f28b32ce6f5fe99af76b2c8e8c95e9fd148a530':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:26:47 +0000 (14:26 +0000)]
am
e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
e74331dc0ef5393115a4381e98b860d80ddfe2a7':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:20:49 +0000 (14:20 +0000)]
am
dc82f4ce: (-s ours) Import translations. DO NOT MERGE
* commit '
dc82f4ce1c77066f07ddf06c5fe923350a86b4e9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:20:06 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 23 Feb 2015 14:18:26 +0000 (06:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I06d6d60e4d09ad158c554e6c8e3865f06895db56
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Feb 2015 14:12:16 +0000 (06:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I470855ce547f2e302f9ad27a3c08ad40d8fd0048
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Feb 2015 14:02:43 +0000 (14:02 +0000)]
am
c8a4babe: (-s ours) am
5211dfd5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
c8a4babe93e4fd0cecb6b91a020b9252ac426004':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:02:36 +0000 (14:02 +0000)]
am
85f270f6: (-s ours) am
1f4e01f2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
85f270f69c9e99bf11947744e5b5091bba5e093c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 14:02:30 +0000 (14:02 +0000)]
am
6001319a: (-s ours) am
7aaaacc1: (-s ours) Import translations. DO NOT MERGE
* commit '
6001319ae4eaad7ab9112b5c7cbb1659e1ec2e2b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 13:55:42 +0000 (13:55 +0000)]
am
5211dfd5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
5211dfd5b49b4e0ed1dbd6bb06e3f96244b55134':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 13:55:37 +0000 (13:55 +0000)]
am
1f4e01f2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
1f4e01f2b30e713cfb679fcb81286ba4a2fd7b53':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 13:55:31 +0000 (13:55 +0000)]
am
7aaaacc1: (-s ours) Import translations. DO NOT MERGE
* commit '
7aaaacc1d1f9c2928c1d4d5df457163eebbdc36f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Feb 2015 13:52:34 +0000 (13:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 23 Feb 2015 13:51:59 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 23 Feb 2015 13:50:48 +0000 (05:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I44a58cca048a4a35b5f815c4be9bd1ca1bfad1b7
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Feb 2015 13:50:45 +0000 (07:50 -0600)]
Import translations. DO NOT MERGE
Change-Id: Ib78275fac19887a479cacb3797c3ddb9e2d1cb0e
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Feb 2015 13:44:35 +0000 (05:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I35b9d89969207b2ce627e5e7af517e6f8f519650
Auto-generated-cl: translation import
Jorim Jaggi [Wed, 4 Feb 2015 15:37:11 +0000 (16:37 +0100)]
Make light status bar fade nicely during unlock transition
By using the timings supplied by window manager for the unlock
transition, the transition from dark -> light status bar looks much
nicer.
Bug:
19233606
Change-Id: I33b9048a10e2bd827ff504ab52f385cc88867112
OSDN Git Service
