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

Raph Levien [Tue, 14 Jul 2015 16:49:51 +0000 (16:49 +0000)]

am aac0c9e7: am 9d66b9cd: am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev

* commit 'aac0c9e7583239ec55e0456c4c88b79f5615caca':
Improve Html.toHtml() documentation

commit | commitdiff | tree

Amith Yamasani [Tue, 14 Jul 2015 16:49:43 +0000 (16:49 +0000)]

am b646cd6d: am f62ca82b: am a5aaf335: am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev

* commit 'b646cd6df50e99464335f3c196e386c8743fd29e':
Fix new user creation regression due to vold remount calls

commit | commitdiff | tree

Amith Yamasani [Tue, 14 Jul 2015 16:49:35 +0000 (16:49 +0000)]

am 09303a48: am ff61f431: am 2ae3ff2d: am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev

* commit '09303a48b7e22ce54f1ea5eb03abcc18afa1d365':
Avoid IPC call with an empty array

commit | commitdiff | tree

Sanket Padawe [Tue, 14 Jul 2015 16:49:28 +0000 (16:49 +0000)]

am d281d10b: am cb9d3de0: am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

* commit 'd281d10b16bec899e6b5ffaaf7180bc214f7b578':
Changes security for Passpoint to EAP security from "Passpoint".

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jul 2015 16:49:17 +0000 (16:49 +0000)]

am e552f0a9: am 60e293cf: am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev

* commit 'e552f0a903c0e2de3437320e0fb22e4205ec6146':
Fix flash of uninitialized surface

commit | commitdiff | tree

Carlos Valdivia [Tue, 14 Jul 2015 16:49:09 +0000 (16:49 +0000)]

am 50cf5e3a: am 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev

* commit '50cf5e3a2bd544f4661660756ffc4c67d5afbb21':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""

commit | commitdiff | tree

Mady Mellor [Tue, 14 Jul 2015 16:49:01 +0000 (16:49 +0000)]

am 604b1138: am 8fe9a017: am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev

* commit '604b1138f166a75b80c79243432798416a843c93':
Fix: line slop shouldn't always increase / decrease by one line

commit | commitdiff | tree

Mady Mellor [Tue, 14 Jul 2015 16:48:54 +0000 (16:48 +0000)]

am ee4d90ba: am 8f85f645: am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev

* commit 'ee4d90ba0d5abbb7379e6f47d97c12619bbfeeee':
Fix line slop issue at end of line for Thai & CJK

commit | commitdiff | tree

Wale Ogunwale [Tue, 14 Jul 2015 16:48:46 +0000 (16:48 +0000)]

am 1b59c401: am bdd89eed: am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit '1b59c401c381ecaca5109cf68c65ec56fa3fe8d6':
Revert "Finish already paused activity if it should be finished after pausing"

commit | commitdiff | tree

John Reck [Tue, 14 Jul 2015 16:48:38 +0000 (16:48 +0000)]

am cbb968cc: am dc7368cb: am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit 'cbb968ccd7318aa61849366a8f170a37f1b8be58':
JNI optimization tweaks to Paint high-frequency methods

commit | commitdiff | tree

Chris Craik [Tue, 14 Jul 2015 16:48:28 +0000 (16:48 +0000)]

am f451be08: am e8a5ae29: am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev

* commit 'f451be081f5460a10b6ccf2d5e129ee69241da0f':
Reduce cost of span type checking

commit | commitdiff | tree

Raph Levien [Tue, 14 Jul 2015 16:27:20 +0000 (16:27 +0000)]

am 9d66b9cd: am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev

* commit '9d66b9cdc022399c2ed9c9c0bb86b172df1b3b75':
Improve Html.toHtml() documentation

commit | commitdiff | tree

Amith Yamasani [Tue, 14 Jul 2015 16:27:13 +0000 (16:27 +0000)]

am f62ca82b: am a5aaf335: am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev

* commit 'f62ca82b96f75c714a5cd82f9d35df2bad686455':
Fix new user creation regression due to vold remount calls

commit | commitdiff | tree

Amith Yamasani [Tue, 14 Jul 2015 16:26:59 +0000 (16:26 +0000)]

am ff61f431: am 2ae3ff2d: am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev

* commit 'ff61f4312a3bba3a217f7da96a300a5ed72d4937':
Avoid IPC call with an empty array

commit | commitdiff | tree

Sanket Padawe [Tue, 14 Jul 2015 16:26:50 +0000 (16:26 +0000)]

am cb9d3de0: am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

* commit 'cb9d3de03293210c76928934e04da5c4b73c833a':
Changes security for Passpoint to EAP security from "Passpoint".

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jul 2015 16:26:43 +0000 (16:26 +0000)]

am 60e293cf: am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev

* commit '60e293cfed07ef32c16262435dc3d9092a7fb572':
Fix flash of uninitialized surface

commit | commitdiff | tree

Carlos Valdivia [Tue, 14 Jul 2015 16:26:35 +0000 (16:26 +0000)]

am 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev

* commit '1aefc7769804ad1b593355f7bd71e4d6f962d132':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""

commit | commitdiff | tree

Mady Mellor [Tue, 14 Jul 2015 16:26:18 +0000 (16:26 +0000)]

am 8fe9a017: am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev

* commit '8fe9a0173ea9dd7334c5a634dea76055097e04ab':
Fix: line slop shouldn't always increase / decrease by one line

commit | commitdiff | tree

Mady Mellor [Tue, 14 Jul 2015 16:26:11 +0000 (16:26 +0000)]

am 8f85f645: am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev

* commit '8f85f645154d02a3808ed3f3a3353d836fd994a5':
Fix line slop issue at end of line for Thai & CJK

commit | commitdiff | tree

Wale Ogunwale [Tue, 14 Jul 2015 16:26:00 +0000 (16:26 +0000)]

am bdd89eed: am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit 'bdd89eed375efdb23be8598e28661f2b7d0964d4':
Revert "Finish already paused activity if it should be finished after pausing"

commit | commitdiff | tree

John Reck [Tue, 14 Jul 2015 16:25:52 +0000 (16:25 +0000)]

am dc7368cb: am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit 'dc7368cb856025b4c9813bc6ff96d5b7c311b690':
JNI optimization tweaks to Paint high-frequency methods

commit | commitdiff | tree

Chris Craik [Tue, 14 Jul 2015 16:25:40 +0000 (16:25 +0000)]

am e8a5ae29: am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev

* commit 'e8a5ae29a0898de1a3194c079821091859afac31':
Reduce cost of span type checking

commit | commitdiff | tree

Paul Crowley [Tue, 14 Jul 2015 14:42:29 +0000 (15:42 +0100)]

Revert "am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev"

This reverts commit c5da3fe1de36c231b8b1ac2aa07c2bf880af7b91, reversing
changes made to d884b41331fa486d5e4b02df725e37a497b08cc9.

commit | commitdiff | tree

Paul Crowley [Tue, 14 Jul 2015 12:00:55 +0000 (12:00 +0000)]

am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev

* commit '8ae629f6cbda2ad55a1b6f3f508a04dc348ed796':
Delete the user key when deleting a user.

commit | commitdiff | tree

Paul Crowley [Tue, 14 Jul 2015 12:00:49 +0000 (12:00 +0000)]

am 4e1174d9: (-s ours) am 7b6493a7: am 62d43bd9: am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev

* commit '4e1174d9a74ee7e16ef98154d9206f5f600a129e':
Use mount service to create user dirs.

commit | commitdiff | tree

Seigo Nonaka [Tue, 14 Jul 2015 06:17:45 +0000 (06:17 +0000)]

Merge "Update fullscreen state on hiding window."

commit | commitdiff | tree

Seigo Nonaka [Tue, 14 Jul 2015 06:05:04 +0000 (15:05 +0900)]

Update fullscreen state on hiding window.

Need to update fullscreen state on hiding window as well as showing
window, otherwise IMM#isFullscreenWindow reports obsolete state after
hiding window by back key or device rotation.

Bug: 22238567
Change-Id: Ic8de161cd5d2ee161f32b9942cdc2c331ea4d48e

commit | commitdiff | tree

Robin Lee [Tue, 14 Jul 2015 00:25:56 +0000 (00:25 +0000)]

am 7475cc16: am 2d64ad5c: am 7321f09f: am 6a5c9370: am 6795a2ae: Check legacy VPN is connected before alerting

* commit '7475cc169c8d4c8da023a6b896e8d2ec8372af92':
Check legacy VPN is connected before alerting

commit | commitdiff | tree

Jorim Jaggi [Tue, 14 Jul 2015 00:25:49 +0000 (00:25 +0000)]

am 0374d4d6: am 9042b4ce: am 3539d328: am 7f3a1557: am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev

* commit '0374d4d6d4f27e4bc5d1b887db06b4705128b2c9':
Fix empty keyguard for once and all

commit | commitdiff | tree

Jinsuk Kim [Tue, 14 Jul 2015 00:25:42 +0000 (00:25 +0000)]

am 3382a2f0: am d2f0d236: am 4946bda6: am d971ebad: am 256642aa: Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev

* commit '3382a2f0a577fac0c5fd012692554637d47ad363':
CEC: Do not switch language if the new one is same as the old one

commit | commitdiff | tree

Raph Levien [Tue, 14 Jul 2015 00:21:16 +0000 (00:21 +0000)]

am 073477a1: am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev

* commit '073477a18ee37c87ad69260edae48f48578af921':
Improve Html.toHtml() documentation

commit | commitdiff | tree

Amith Yamasani [Tue, 14 Jul 2015 00:21:08 +0000 (00:21 +0000)]

am a5aaf335: am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev

* commit 'a5aaf335fa57e34622c6638efe8849c46ae76087':
Fix new user creation regression due to vold remount calls

commit | commitdiff | tree

Amith Yamasani [Tue, 14 Jul 2015 00:21:02 +0000 (00:21 +0000)]

am 2ae3ff2d: am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev

* commit '2ae3ff2deac3d700f9fe39f16ab2afef69ac13c8':
Avoid IPC call with an empty array

commit | commitdiff | tree

Sanket Padawe [Tue, 14 Jul 2015 00:20:55 +0000 (00:20 +0000)]

am f1a9868e: am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

* commit 'f1a9868e18d1feb56434313701faaf52473f0942':
Changes security for Passpoint to EAP security from "Passpoint".

commit | commitdiff | tree

Adrian Roos [Tue, 14 Jul 2015 00:20:49 +0000 (00:20 +0000)]

am 63d58c0a: am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev

* commit '63d58c0a33655faa1c6dd847d589872ab4d4f375':
Fix flash of uninitialized surface

commit | commitdiff | tree

Carlos Valdivia [Tue, 14 Jul 2015 00:20:42 +0000 (00:20 +0000)]

am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev

* commit '4e976dd141dd585f7aea580048a85829e8658753':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""

commit | commitdiff | tree

Mady Mellor [Tue, 14 Jul 2015 00:20:36 +0000 (00:20 +0000)]

am 441ad4df: am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev

* commit '441ad4df23e064cefbed6e3b63ee56161ce19032':
Fix: line slop shouldn't always increase / decrease by one line

commit | commitdiff | tree

Mady Mellor [Tue, 14 Jul 2015 00:20:29 +0000 (00:20 +0000)]

am 9d4cd8cf: am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev

* commit '9d4cd8cf48a06dbf2c6dff6ef2caf5ed79f89bff':
Fix line slop issue at end of line for Thai & CJK

commit | commitdiff | tree

Wale Ogunwale [Tue, 14 Jul 2015 00:20:21 +0000 (00:20 +0000)]

am d91f9c7e: am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit 'd91f9c7e996241060a7503461e44e4e6787611dd':
Revert "Finish already paused activity if it should be finished after pausing"

commit | commitdiff | tree

John Reck [Tue, 14 Jul 2015 00:20:15 +0000 (00:20 +0000)]

am 78c93dfc: am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit '78c93dfce682cac02f1e61b7c943c19fe5160001':
JNI optimization tweaks to Paint high-frequency methods

commit | commitdiff | tree

Chris Craik [Tue, 14 Jul 2015 00:20:07 +0000 (00:20 +0000)]

am 3b34b006: am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev

* commit '3b34b0061b1c57e5932fc17f8611574233e768ae':
Reduce cost of span type checking

commit | commitdiff | tree

Paul Crowley [Mon, 13 Jul 2015 23:51:03 +0000 (23:51 +0000)]

am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev

* commit '63690fa5b056523e2dce52fe9dc2954e92b55bca':
Delete the user key when deleting a user.

commit | commitdiff | tree

Paul Crowley [Mon, 13 Jul 2015 23:50:58 +0000 (23:50 +0000)]

am 7b6493a7: am 62d43bd9: am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev

* commit '7b6493a7b7da70610735b87c30f0c2c9d0cf0ea1':
Use mount service to create user dirs.

commit | commitdiff | tree

Robin Lee [Mon, 13 Jul 2015 23:50:52 +0000 (23:50 +0000)]

am 2d64ad5c: am 7321f09f: am 6a5c9370: am 6795a2ae: Check legacy VPN is connected before alerting

* commit '2d64ad5c9d52ab89334ebcdeb07d2d556db8a989':
Check legacy VPN is connected before alerting

commit | commitdiff | tree

Jorim Jaggi [Mon, 13 Jul 2015 23:50:44 +0000 (23:50 +0000)]

am 9042b4ce: am 3539d328: am 7f3a1557: am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev

* commit '9042b4ced76b5ecdb6d4c334eb7004c34c7892a7':
Fix empty keyguard for once and all

commit | commitdiff | tree

Jinsuk Kim [Mon, 13 Jul 2015 23:50:39 +0000 (23:50 +0000)]

am d2f0d236: am 4946bda6: am d971ebad: am 256642aa: Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev

* commit 'd2f0d23609cdf141e69fcd3f9851579bd1a29e52':
CEC: Do not switch language if the new one is same as the old one

commit | commitdiff | tree

Raph Levien [Mon, 13 Jul 2015 23:34:55 +0000 (23:34 +0000)]

am 93a2c97d: am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev

* commit '93a2c97dc71b211de1e9e3a7a64aa301309f3308':
Improve Html.toHtml() documentation

commit | commitdiff | tree

Amith Yamasani [Mon, 13 Jul 2015 23:33:48 +0000 (23:33 +0000)]

am 0fd2d2b1: am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev

* commit '0fd2d2b124d2aa614131c7b9cedde9d18e830724':
Fix new user creation regression due to vold remount calls

commit | commitdiff | tree

Amith Yamasani [Mon, 13 Jul 2015 23:33:44 +0000 (23:33 +0000)]

am 8117c2f8: am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev

* commit '8117c2f8e491d9b48769139c5bca685e88106ae5':
Avoid IPC call with an empty array

commit | commitdiff | tree

Sanket Padawe [Mon, 13 Jul 2015 23:33:40 +0000 (23:33 +0000)]

am 0a66123f: am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

* commit '0a66123f62f5d28bbef4f88a32c6de97caab3cfe':
Changes security for Passpoint to EAP security from "Passpoint".

commit | commitdiff | tree

Adrian Roos [Mon, 13 Jul 2015 23:33:35 +0000 (23:33 +0000)]

am dc445a11: am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev

* commit 'dc445a115fb93d3b6c900cd823032f340cc3cd56':
Fix flash of uninitialized surface

commit | commitdiff | tree

Carlos Valdivia [Mon, 13 Jul 2015 23:33:31 +0000 (23:33 +0000)]

am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev

* commit 'cc3c93d30cd16597eb1e551d36237692cdb1299d':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""

commit | commitdiff | tree

Mady Mellor [Mon, 13 Jul 2015 23:33:26 +0000 (23:33 +0000)]

am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev

* commit '7fac4d6cc41cab81b2b2202725ae69782f9bcce9':
Fix: line slop shouldn't always increase / decrease by one line

commit | commitdiff | tree

Mady Mellor [Mon, 13 Jul 2015 23:33:22 +0000 (23:33 +0000)]

am 24950db2: am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev

* commit '24950db2768def06509e9bfd4ed6ecb47318f31d':
Fix line slop issue at end of line for Thai & CJK

commit | commitdiff | tree

Wale Ogunwale [Mon, 13 Jul 2015 23:33:18 +0000 (23:33 +0000)]

am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit '6ede9b679e3313816c11d5d84f3bea679d6f337b':
Revert "Finish already paused activity if it should be finished after pausing"

commit | commitdiff | tree

John Reck [Mon, 13 Jul 2015 23:33:13 +0000 (23:33 +0000)]

am 459337c8: am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit '459337c8d41d516d7a85084cf7e7a8f83e14f426':
JNI optimization tweaks to Paint high-frequency methods

commit | commitdiff | tree

Chris Craik [Mon, 13 Jul 2015 23:33:08 +0000 (23:33 +0000)]

am be10a866: am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev

* commit 'be10a86620947bfee882c50ae725ceb10cbae98f':
Reduce cost of span type checking

commit | commitdiff | tree

Raph Levien [Mon, 13 Jul 2015 23:00:20 +0000 (23:00 +0000)]

am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev

* commit '1b3d03512e7bc759d3cd340280d7a5c59195a063':
Improve Html.toHtml() documentation

commit | commitdiff | tree

Paul Crowley [Mon, 13 Jul 2015 22:48:55 +0000 (22:48 +0000)]

am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev

* commit '140ff7a50b826b277ea8cecbfd11df3d3eeddad4':
Delete the user key when deleting a user.

commit | commitdiff | tree

Paul Crowley [Mon, 13 Jul 2015 22:48:48 +0000 (22:48 +0000)]

am 62d43bd9: am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev

* commit '62d43bd9e8b72cb87a7dee17db578d63d19aca0e':
Use mount service to create user dirs.

commit | commitdiff | tree

Robin Lee [Mon, 13 Jul 2015 22:48:43 +0000 (22:48 +0000)]

am 7321f09f: am 6a5c9370: am 6795a2ae: Check legacy VPN is connected before alerting

* commit '7321f09fd7d64ca8883d4fc8d0e43ef16bf72091':
Check legacy VPN is connected before alerting

commit | commitdiff | tree

Jorim Jaggi [Mon, 13 Jul 2015 22:48:37 +0000 (22:48 +0000)]

am 3539d328: am 7f3a1557: am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev

* commit '3539d32806b74bbcd6a89aa99ec31c5acc7e0546':
Fix empty keyguard for once and all

commit | commitdiff | tree

Jinsuk Kim [Mon, 13 Jul 2015 22:48:31 +0000 (22:48 +0000)]

am 4946bda6: am d971ebad: am 256642aa: Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev

* commit '4946bda6585bb094b5cac3b704f5083a1245e07c':
CEC: Do not switch language if the new one is same as the old one

commit | commitdiff | tree

Amith Yamasani [Mon, 13 Jul 2015 22:45:33 +0000 (22:45 +0000)]

am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev

* commit '292eb65f1ee0747e60899c1b1d0b6cb16c9cd37a':
Fix new user creation regression due to vold remount calls

commit | commitdiff | tree

Amith Yamasani [Mon, 13 Jul 2015 22:45:29 +0000 (22:45 +0000)]

am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev

* commit '5449ee078620255ce9bea60c0a4dbece36e6acf9':
Avoid IPC call with an empty array

commit | commitdiff | tree

Paul Crowley [Mon, 13 Jul 2015 22:34:51 +0000 (22:34 +0000)]

am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev

* commit 'bac3d0936dfdb4d594873fd8690e8017e748ed96':
Delete the user key when deleting a user.

commit | commitdiff | tree

Paul Crowley [Mon, 13 Jul 2015 22:34:47 +0000 (22:34 +0000)]

am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev

* commit '9e0e69915a2e45dd5ba158e0436571551a672636':
Use mount service to create user dirs.

commit | commitdiff | tree

Robin Lee [Mon, 13 Jul 2015 22:34:41 +0000 (22:34 +0000)]

am 6a5c9370: am 6795a2ae: Check legacy VPN is connected before alerting

* commit '6a5c937042d54d22d79f82772771c99e618a1787':
Check legacy VPN is connected before alerting

commit | commitdiff | tree

Jorim Jaggi [Mon, 13 Jul 2015 22:34:36 +0000 (22:34 +0000)]

am 7f3a1557: am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev

* commit '7f3a15574c0b33c194625046cdc47a76879434db':
Fix empty keyguard for once and all

commit | commitdiff | tree

Jinsuk Kim [Mon, 13 Jul 2015 22:34:31 +0000 (22:34 +0000)]

am d971ebad: am 256642aa: Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev

* commit 'd971ebadbdfef6fb818505ad9c6651667fc26c83':
CEC: Do not switch language if the new one is same as the old one

commit | commitdiff | tree

Sanket Padawe [Mon, 13 Jul 2015 22:30:37 +0000 (22:30 +0000)]

am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

* commit '233bd3ceffbe247b5230f2832ad63c6cf1d9ed13':
Changes security for Passpoint to EAP security from "Passpoint".

commit | commitdiff | tree

Adrian Roos [Mon, 13 Jul 2015 22:30:29 +0000 (22:30 +0000)]

am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev

* commit 'd374c20fc9269913d19666f0994268ed457e0d42':
Fix flash of uninitialized surface

commit | commitdiff | tree

Carlos Valdivia [Mon, 13 Jul 2015 22:30:24 +0000 (22:30 +0000)]

am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev

* commit '97cf0f1d76f1747302e0171c1cd4f0655fde99c4':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""

commit | commitdiff | tree

Mady Mellor [Mon, 13 Jul 2015 22:30:13 +0000 (22:30 +0000)]

am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev

* commit '1c277ca8cd699b15e631342775d996404a75e660':
Fix: line slop shouldn't always increase / decrease by one line

commit | commitdiff | tree

Mady Mellor [Mon, 13 Jul 2015 22:30:08 +0000 (22:30 +0000)]

am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev

* commit 'a9f07ccf38709be29137dec246bca7fea976a294':
Fix line slop issue at end of line for Thai & CJK

commit | commitdiff | tree

Wale Ogunwale [Mon, 13 Jul 2015 22:29:46 +0000 (22:29 +0000)]

am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit '26b0f1e420c0590ea5e9c506f4f14ba4b0a873f0':
Revert "Finish already paused activity if it should be finished after pausing"

commit | commitdiff | tree

John Reck [Mon, 13 Jul 2015 22:29:41 +0000 (22:29 +0000)]

am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit '8657d9e8a56af7847578b65a881016da985b3531':
JNI optimization tweaks to Paint high-frequency methods

commit | commitdiff | tree

Chris Craik [Mon, 13 Jul 2015 22:29:36 +0000 (22:29 +0000)]

am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev

* commit '9f0049200824ae523a6cd39b9866c709d42e3075':
Reduce cost of span type checking

commit | commitdiff | tree

James Cook [Mon, 13 Jul 2015 21:16:36 +0000 (21:16 +0000)]

Merge "Move shelf config setting into SystemUI"

commit | commitdiff | tree

Paul Crowley [Mon, 13 Jul 2015 20:53:55 +0000 (20:53 +0000)]

Merge "Delete the user key when deleting a user." into mnc-dr-dev

commit | commitdiff | tree

Paul Crowley [Mon, 13 Jul 2015 20:53:04 +0000 (20:53 +0000)]

Merge "Use mount service to create user dirs." into mnc-dr-dev

commit | commitdiff | tree

Derek Sollenberger [Mon, 13 Jul 2015 17:53:27 +0000 (17:53 +0000)]

Merge "Move drawRegion from DisplayList to Canvas"

commit | commitdiff | tree

Robin Lee [Mon, 13 Jul 2015 17:51:02 +0000 (17:51 +0000)]

am 6795a2ae: Check legacy VPN is connected before alerting

* commit '6795a2aeafa6df8a5e8e3045d29991d33c8db33f':
Check legacy VPN is connected before alerting

commit | commitdiff | tree

Jorim Jaggi [Mon, 13 Jul 2015 17:50:58 +0000 (17:50 +0000)]

am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev

* commit '0c758805b385a5c136b21a2b38e2383c30665282':
Fix empty keyguard for once and all

commit | commitdiff | tree

Jinsuk Kim [Mon, 13 Jul 2015 17:50:53 +0000 (17:50 +0000)]

am 256642aa: Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev

* commit '256642aa2f7045552d474d814323e9eb5b486113':
CEC: Do not switch language if the new one is same as the old one

commit | commitdiff | tree

Derek Sollenberger [Fri, 10 Jul 2015 13:58:41 +0000 (09:58 -0400)]

Move drawRegion from DisplayList to Canvas

Change-Id: I9f401dc5b24732938ac2ca7ed829796e2d7ef3e8

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:41:53 +0000 (16:41 +0000)]

am 367b3882: (-s ours) am 616b5f7a: (-s ours) am 1181b92d: (-s ours) am 6eee5e4d: (-s ours) Import translations. DO NOT MERGE

* commit '367b38823f4a238173f4585595d3563aa97b77c5':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:27:23 +0000 (16:27 +0000)]

am 616b5f7a: (-s ours) am 1181b92d: (-s ours) am 6eee5e4d: (-s ours) Import translations. DO NOT MERGE

* commit '616b5f7a9de802bcc8208bbd1e93cbe3c8e26593':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:14:11 +0000 (16:14 +0000)]

am 1181b92d: (-s ours) am 6eee5e4d: (-s ours) Import translations. DO NOT MERGE

* commit '1181b92d323b60d7ede72bf619a25a95520c2c42':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:02:16 +0000 (16:02 +0000)]

am d81b755d: (-s ours) am c531bb2d: (-s ours) am 7c2f4148: (-s ours) am a8bbc7ac: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:02:10 +0000 (16:02 +0000)]

am f080d864: (-s ours) am f8434712: (-s ours) am 0367b1c1: (-s ours) am ec10f595: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:02:02 +0000 (16:02 +0000)]

am 856a9f99: (-s ours) am e7575570: (-s ours) am ebaecc0c: (-s ours) am cc9b8ddd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '856a9f99d514c6adf55c9ecedde866582a03a84a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:01:54 +0000 (16:01 +0000)]

am 3772e27c: (-s ours) am 5e73ac02: (-s ours) am 305cf0f8: (-s ours) am 4d64bdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '3772e27cb6ec797a1b79f5f93bbd6b72163d3671':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:01:47 +0000 (16:01 +0000)]

am 03107751: (-s ours) am 9cee0e77: (-s ours) am ce5c1ac8: (-s ours) am f841432e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '0310775154f533d1b6b156ceabe610bd4c249d25':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:01:40 +0000 (16:01 +0000)]

am 329c9de2: (-s ours) am 12d21f10: (-s ours) am faa4706f: (-s ours) am 1fc614f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '329c9de254511caca39a98dbf4f15797c9daf55e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:01:30 +0000 (16:01 +0000)]

am 781f697a: (-s ours) am 320c9617: (-s ours) am 501461e3: (-s ours) am 4dbca7f6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '781f697aead59594d0f980c3b83bb65de2982ee4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:01:23 +0000 (16:01 +0000)]

am 2525bb26: (-s ours) am e82d2508: (-s ours) am 6df69ed3: (-s ours) am d7805ef7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '2525bb26c12b38509694ea93c61be3c0fccde25c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:01:16 +0000 (16:01 +0000)]

am 7458493e: (-s ours) am 584e10e1: (-s ours) am 9bee6f1a: (-s ours) am 7ff74826: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '7458493e55fc2c04332dcfe5824c4111adf41ebf':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:01:08 +0000 (16:01 +0000)]

am 709c5458: (-s ours) am eb1ed80a: (-s ours) am 8a4717de: (-s ours) am 388d1cc8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '709c54588adf1c75a52e93e3ea19fc8b22d55260':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Jul 2015 16:01:01 +0000 (16:01 +0000)]

am 6eee5e4d: (-s ours) Import translations. DO NOT MERGE

* commit '6eee5e4dbef6fe400b3d0cb375817581eaadd45e':
Import translations. DO NOT MERGE