git.osdn.net Git - android-x86/frameworks-base.git/log

Baligh Uddin [Wed, 3 Dec 2014 07:56:51 +0000 (07:56 +0000)]

am 70b44364: (-s ours) am 925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '70b44364a1a0c7d6879670ead2fcbc7be02ec7f8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 07:56:46 +0000 (07:56 +0000)]

am 204f2628: (-s ours) am 91426aa2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '204f26284cab010913829c412d39c7eee576080f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 07:56:41 +0000 (07:56 +0000)]

am eb0fdf48: (-s ours) am ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'eb0fdf48b75c567666676bb0b01ae098ab471407':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 07:56:36 +0000 (07:56 +0000)]

am c64e49ad: (-s ours) am 51bca143: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'c64e49adcab9b9f7680eeef8d33e18c30bda54c0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 07:56:31 +0000 (07:56 +0000)]

am a221d299: (-s ours) am d33f84eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'a221d299c0f9a6ec82daf91bcd7ac739eefe653a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 07:56:26 +0000 (07:56 +0000)]

am 42f0a843: (-s ours) am fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '42f0a8434636497737dae01db719908cc45910e4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Michael Wright [Wed, 3 Dec 2014 07:56:20 +0000 (07:56 +0000)]

am 4de2ab4c: am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev

* commit '4de2ab4c55f74a7e166f58c7b7e72fc47c0d24c1':
Correctly iterate through MediaProjection callbacks.

commit | commitdiff | tree

Alan Viverette [Wed, 3 Dec 2014 07:56:12 +0000 (07:56 +0000)]

am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev

* commit 'bb241c3cdedb96d2a3a61e913102d6186f12103a':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

commit | commitdiff | tree

Dan Sandler [Wed, 3 Dec 2014 07:56:07 +0000 (07:56 +0000)]

am 29f89da0: am dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev

* commit '29f89da0a8a38dd060c8bd277d7473ccc3843185':
Turn off DEBUG_GESTURES

commit | commitdiff | tree

George Mount [Wed, 3 Dec 2014 07:56:00 +0000 (07:56 +0000)]

am 24fac506: am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev

* commit '24fac506f0204433aa3d2314d3ac7f909b6eb67a':
Keep snapshot order matching the shared elements.

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 02:18:50 +0000 (02:18 +0000)]

am 925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '925c27bef875f20f4b34254c588296f10fc5fe5a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 02:18:45 +0000 (02:18 +0000)]

am 91426aa2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '91426aa292455aef968e112c2255dd676f7f1ec6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 02:18:40 +0000 (02:18 +0000)]

am ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'ed3383770e77b88ab0692bee9acef8d78b2cc7a2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 02:18:35 +0000 (02:18 +0000)]

am 51bca143: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '51bca143862c568507206adf119c9003a4f3f764':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 02:18:30 +0000 (02:18 +0000)]

am d33f84eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'd33f84eb3e20b781e433d93165d9ff83434d5c99':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 02:18:24 +0000 (02:18 +0000)]

am fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'fccb3b43a9dfe4dfd3d03119e37b2c99fc95042c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Michael Wright [Wed, 3 Dec 2014 02:18:19 +0000 (02:18 +0000)]

am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev

* commit '7081a5d1ae6b9fe5d92dca25a85524c2c2421e1e':
Correctly iterate through MediaProjection callbacks.

commit | commitdiff | tree

Alan Viverette [Wed, 3 Dec 2014 02:18:12 +0000 (02:18 +0000)]

am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev

* commit '4eb2e04f4d3eafdf56840a0988dd730dc433478d':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

commit | commitdiff | tree

Dan Sandler [Wed, 3 Dec 2014 02:18:06 +0000 (02:18 +0000)]

am dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev

* commit 'dfb39ce332d4256363d1c2a47e68eecd5f144edc':
Turn off DEBUG_GESTURES

commit | commitdiff | tree

George Mount [Wed, 3 Dec 2014 02:17:58 +0000 (02:17 +0000)]

am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev

* commit '561261d4442fb78b314c00f6b836fe7b1c387977':
Keep snapshot order matching the shared elements.

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 01:25:53 +0000 (01:25 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 01:25:26 +0000 (01:25 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 01:25:10 +0000 (01:25 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 01:24:48 +0000 (01:24 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 01:24:38 +0000 (01:24 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 01:24:32 +0000 (01:24 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Michael Wright [Wed, 3 Dec 2014 01:14:20 +0000 (01:14 +0000)]

Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 00:47:06 +0000 (16:47 -0800)]

Import translations. DO NOT MERGE

Change-Id: I32d37766e97752a7f9479cdf933470978ca3f616
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 00:45:14 +0000 (16:45 -0800)]

Import translations. DO NOT MERGE

Change-Id: Id585c5bed5366430b476445a1806748894dd34ac
Auto-generated-cl: translation import

commit | commitdiff | tree

Alan Viverette [Wed, 3 Dec 2014 00:43:46 +0000 (00:43 +0000)]

Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 00:37:24 +0000 (16:37 -0800)]

Import translations. DO NOT MERGE

Change-Id: I7224417957b74eabb5e828d94ad11d89738f1724
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 00:32:15 +0000 (16:32 -0800)]

Import translations. DO NOT MERGE

Change-Id: I6d028c94d3ac7df54925008e3cd71973aa9254c9
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 00:30:05 +0000 (16:30 -0800)]

Import translations. DO NOT MERGE

Change-Id: I91311501af2edb114e6db77786fcefaa6d26db3a
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 3 Dec 2014 00:28:12 +0000 (16:28 -0800)]

Import translations. DO NOT MERGE

Change-Id: I5615709624d61d837bd562cc5bb4c454ef983527
Auto-generated-cl: translation import

commit | commitdiff | tree

Alan Viverette [Wed, 3 Dec 2014 00:24:24 +0000 (16:24 -0800)]

Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

Using CURRENT isn't always safe.

BUG: 18557273
Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2

commit | commitdiff | tree

Dan Sandler [Wed, 3 Dec 2014 00:22:17 +0000 (00:22 +0000)]

Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev

commit | commitdiff | tree

George Mount [Wed, 3 Dec 2014 00:13:27 +0000 (00:13 +0000)]

Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev

commit | commitdiff | tree

Adam Lesinski [Wed, 3 Dec 2014 00:05:33 +0000 (00:05 +0000)]

am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev

* commit 'f17611a29e3b0d0c7a5d28a1ce92682a2c097de6':
AAPT: Add custom transition classes to Proguard keep set

commit | commitdiff | tree

Jason Sams [Wed, 3 Dec 2014 00:00:21 +0000 (00:00 +0000)]

am b940599a: am abdaa32d: Merge "Fix bug in passing of context flags and version."

* commit 'b940599a750e3ee50934c57b6a22841627be2d2e':
Fix bug in passing of context flags and version.

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 23:57:12 +0000 (23:57 +0000)]

am 130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev

* commit '130e30fe247c85aeb777a0f60b31885fef613930':
AAPT: Add custom transition classes to Proguard keep set

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 23:56:58 +0000 (23:56 +0000)]

am f9221a10: am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev

* commit 'f9221a1076203832d8d88a8720c12cad91aee906':
Properly recognize repeating wakeup alarms

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 23:56:52 +0000 (23:56 +0000)]

am f246b484: am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev

* commit 'f246b484c5cf8b63e1b700d17e8161f566e3f5d7':
Midnight should mean midnight

commit | commitdiff | tree

Jason Sams [Tue, 2 Dec 2014 23:52:12 +0000 (23:52 +0000)]

am abdaa32d: Merge "Fix bug in passing of context flags and version."

* commit 'abdaa32dd79c915d0e419560c8eaa64e3d946b77':
Fix bug in passing of context flags and version.

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 23:50:49 +0000 (23:50 +0000)]

Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 23:48:31 +0000 (23:48 +0000)]

am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev

* commit '3bec50908b8438c04a654a3bb806f05a01402ce7':
Properly recognize repeating wakeup alarms

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 23:48:26 +0000 (23:48 +0000)]

am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev

* commit '99391361217cd9234ddc0570055677863cb6fb34':
Midnight should mean midnight

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:45:31 +0000 (23:45 +0000)]

am fa173e0c: am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev

* commit 'fa173e0c65219e56625c22b0ac482354d924bcd8':
Update drawable container constant state following clone

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:45:25 +0000 (23:45 +0000)]

am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

* commit 'a6779bc51772aae2ba4cc94db2ae47b76a2cc972':
Deprecate one-arg getDrawableForDensity, update currents.txt

commit | commitdiff | tree

Jason Sams [Tue, 2 Dec 2014 23:45:16 +0000 (23:45 +0000)]

Merge "Fix bug in passing of context flags and version."

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 23:44:18 +0000 (23:44 +0000)]

Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev

commit | commitdiff | tree

Christopher Tate [Tue, 2 Dec 2014 23:43:58 +0000 (23:43 +0000)]

Merge "Midnight should mean midnight" into lmp-mr1-dev

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 22:50:21 +0000 (14:50 -0800)]

AAPT: Add custom transition classes to Proguard keep set

Bug:18590044
Change-Id: Ib24831e669a09f0e6f32434081c0e2499702399c

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:37:55 +0000 (23:37 +0000)]

am d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev

* commit 'd72901f0d47d2339d8cedb6af0b4d8c58b3178ae':
Update drawable container constant state following clone

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:37:47 +0000 (23:37 +0000)]

am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

* commit '9a888816de21c4e146acbd608fdea110a299f42d':
Deprecate one-arg getDrawableForDensity, update currents.txt

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:31:08 +0000 (23:31 +0000)]

Merge "Update drawable container constant state following clone" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:30:52 +0000 (23:30 +0000)]

Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

commit | commitdiff | tree

Svetoslav [Tue, 2 Dec 2014 23:30:21 +0000 (23:30 +0000)]

am 95482c28: am cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev

* commit '95482c28f5b6fba7427770212374c3c8d22b280e':
Allow more space for the printer spinner to avoid truncation.

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:26:33 +0000 (15:26 -0800)]

Deprecate one-arg getDrawableForDensity, update currents.txt

BUG: 18579576
Change-Id: I7df6ec2952ab121e2be8ae0a016ccf36f6fba2ff

commit | commitdiff | tree

Svetoslav [Tue, 2 Dec 2014 23:23:40 +0000 (23:23 +0000)]

am cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev

* commit 'cdd3356da9386bff842d9a29fad09a1d5edc1e73':
Allow more space for the printer spinner to avoid truncation.

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:19:28 +0000 (23:19 +0000)]

am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

* commit '63c7a655beab21da934d21bb4004889bfb6e4417':
Deprecate Resources.getDrawable(int) in favor of the two-arg version

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 23:19:23 +0000 (23:19 +0000)]

am ce9936a8: am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit 'ce9936a85e6b73b47e0c9a6b4c3495dffae4a079':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Svetoslav [Tue, 2 Dec 2014 23:16:36 +0000 (23:16 +0000)]

Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:11:36 +0000 (23:11 +0000)]

am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

* commit '1b33396ee4047e79777495a8682b9117e88bba5c':
Deprecate Resources.getDrawable(int) in favor of the two-arg version

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 23:11:30 +0000 (23:11 +0000)]

am 152470a2: am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '152470a29212479c8ccc9e2c1a9f26188a5b7411':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 23:07:43 +0000 (23:07 +0000)]

am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c

* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 23:07:01 +0000 (23:07 +0000)]

Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 23:05:07 +0000 (23:05 +0000)]

am 8c71df8d: am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '8c71df8dd89c68128e709eab60da8105772d6194':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 23:00:06 +0000 (23:00 +0000)]

am e89a2865: Merge changes If2c7e09f,Ie21f227c

* commit 'e89a286541e242ad96705fcdd1fe2c6a9eafb4a0':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 22:58:08 +0000 (14:58 -0800)]

Deprecate Resources.getDrawable(int) in favor of the two-arg version

This is a landmine for developers. If they need to obtain an unthemed
drawable, they should be using an explicit null theme.

BUG: 18579576
Change-Id: Ibca6b4c3e8e50dca144571244e035caec6fa91f8

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 22:56:38 +0000 (22:56 +0000)]

am f9b8bd5e: am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit 'f9b8bd5e73cdb694eab1b158e7b313be60534820':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Adam Lesinski [Tue, 2 Dec 2014 22:52:36 +0000 (22:52 +0000)]

Merge changes If2c7e09f,Ie21f227c

* changes:
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets

commit | commitdiff | tree

Ricardo Cervera [Tue, 2 Dec 2014 22:50:48 +0000 (22:50 +0000)]

am 6ee2ca2f: docs: Long press to dismiss fix by Wayne

* commit '6ee2ca2f1e24d27c7a1e2430ad0272ef9f921a4a':
docs: Long press to dismiss fix by Wayne

commit | commitdiff | tree

Chris Wren [Tue, 2 Dec 2014 22:45:22 +0000 (22:45 +0000)]

am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"

* commit '47a5cb122ab495e8420c46d8f324bddcd38920af':
Keep deleteIntent when copying Notification attributes

commit | commitdiff | tree

Chris Wren [Tue, 2 Dec 2014 22:38:28 +0000 (22:38 +0000)]

am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"

* commit 'acd01ff07668a608cb4890a2ea1533a2397149c8':
Keep deleteIntent when copying Notification attributes

commit | commitdiff | tree

George Mount [Tue, 2 Dec 2014 00:44:05 +0000 (16:44 -0800)]

Keep snapshot order matching the shared elements.

Bug 18578796

When no snapshot was created, we weren't adding anything to
the snapshot list. When a snapshot is not created, we should
add an null snapshot to the snapshot list to keep them in
order.

Change-Id: I522e485163229230037dcdd635b83cff800df28f

commit | commitdiff | tree

Chris Wren [Tue, 2 Dec 2014 22:31:06 +0000 (22:31 +0000)]

Merge "Keep deleteIntent when copying Notification attributes"

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:27:22 +0000 (22:27 +0000)]

am e3a16016: (-s ours) am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'e3a160169bc26bcac35d1759423ab4e98a18d063':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:27:16 +0000 (22:27 +0000)]

am 74724945: (-s ours) am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '747249454ed12b4def32f82c461d5590bec2f2f8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:27:11 +0000 (22:27 +0000)]

am 3bcc97e7: (-s ours) am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '3bcc97e7a1eab012d55fa85fa352a95f7c26f547':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:27:06 +0000 (22:27 +0000)]

am 261db4f3: (-s ours) am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '261db4f3a8709a0773d0932dd1052f526e59da3c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:20:03 +0000 (22:20 +0000)]

am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '92ad4dd017a13364b4001bdb04911202932f81c2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:19:58 +0000 (22:19 +0000)]

am fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'fccaa58c5e254c9fdbf1e90ebfa0d0e27fc33585':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:19:53 +0000 (22:19 +0000)]

am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '6774911ee2954eebf2b2003e97b949be6bdbd836':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:19:48 +0000 (22:19 +0000)]

am 30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '30460ae37e2d4f8ffda646af471b7039b519d65a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:16:24 +0000 (22:16 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:14:50 +0000 (22:14 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:14:48 +0000 (22:14 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:14:46 +0000 (22:14 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:14:05 +0000 (14:14 -0800)]

Import translations. DO NOT MERGE

Change-Id: I6acd5c2437f73dcbeca9cf6746c0a7c23c98eebc
Auto-generated-cl: translation import

commit | commitdiff | tree

Christoph Studer [Tue, 25 Nov 2014 11:53:55 +0000 (12:53 +0100)]

Turn off DEBUG_GESTURES

Stop spamming the logs.

Bug: 18584495
Change-Id: Icc7337005a0efc0590b502e93c459f05f0a9ace9

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:09:14 +0000 (14:09 -0800)]

Import translations. DO NOT MERGE

Change-Id: I59cdaeb46767c757f817f3e15b7794e7773aa41d
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:07:25 +0000 (14:07 -0800)]

Import translations. DO NOT MERGE

Change-Id: I1fa46bb80033e1eee5de30cbf0d0d5d07ae4147c
Auto-generated-cl: translation import

commit | commitdiff | tree

Jinsuk Kim [Tue, 2 Dec 2014 22:05:11 +0000 (22:05 +0000)]

am 566d15f6: am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

* commit '566d15f653c2e2c8440090bb2cca1baaad658436':
CEC: Set the parameter of <System Audio Mode Request> right

commit | commitdiff | tree

Baligh Uddin [Tue, 2 Dec 2014 22:04:01 +0000 (14:04 -0800)]

Import translations. DO NOT MERGE

Change-Id: I5bfbdcf0a1631d7a0d6c19acabaa89f454ac177e
Auto-generated-cl: translation import

commit | commitdiff | tree

Alan Viverette [Tue, 2 Dec 2014 21:58:27 +0000 (13:58 -0800)]

resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp

Change-Id: Icb394ddc92eb64732993ef345284e63c9844f76b

commit | commitdiff | tree

Jinsuk Kim [Tue, 2 Dec 2014 21:58:18 +0000 (21:58 +0000)]

am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

* commit 'fb020862e0d8740d31ead217fd4d308450b4170d':
CEC: Set the parameter of <System Audio Mode Request> right

commit | commitdiff | tree

Jinsuk Kim [Tue, 2 Dec 2014 21:50:42 +0000 (21:50 +0000)]

Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev

commit | commitdiff | tree

Svetoslav [Tue, 2 Dec 2014 21:46:23 +0000 (13:46 -0800)]

Allow more space for the printer spinner to avoid truncation.

The save to PDF option is truncated in Russian. While the printer
name can be arbitrarily long, the Save to PDF printer should not
be truncated.

bug:18546218

Change-Id: Id35bd638c505783a2288c1602960e8d74ec3b882

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 21:27:23 +0000 (21:27 +0000)]

am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

* commit 'e4e7d2cdf40407240d63ef4f0a3249e726a1d632':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED

commit | commitdiff | tree

Craig Mautner [Tue, 2 Dec 2014 21:20:17 +0000 (21:20 +0000)]

am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

* commit '41ec0400056daa97d40bd4a8225b7d4f0d665598':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED