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

Sandeep Siddhartha [Thu, 17 Jul 2014 21:05:38 +0000 (21:05 +0000)]

am ee3f0316: am 15cafc26: am 4b360037: Support model deletion

* commit 'ee3f031667aae146119caa824fea3c181f37f0c0':
Support model deletion

commit | commitdiff | tree

Craig Mautner [Thu, 17 Jul 2014 21:05:34 +0000 (21:05 +0000)]

am 46522214: am 73c69b27: am c2d339a6: Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev

* commit '46522214889f27e1cc014af63cb0d06a49c0e889':
Additional cleanup after stack deletion.

commit | commitdiff | tree

Adrian Roos [Thu, 17 Jul 2014 21:05:30 +0000 (21:05 +0000)]

am 92761b2d: am 627e93b0: am 26f08cdc: Merge "QS Guest fixes" into lmp-dev

* commit '92761b2d3c35d3fedbf7e4121c06251d61d63f82':
QS Guest fixes

commit | commitdiff | tree

Christopher Tate [Thu, 17 Jul 2014 21:05:25 +0000 (21:05 +0000)]

am 0c3679f4: am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback

* commit '0c3679f423006976766c8eafbc78d7c3702990d5':
Add BackupAgent.onRestoreFinished() callback

commit | commitdiff | tree

ztenghui [Thu, 17 Jul 2014 21:05:21 +0000 (21:05 +0000)]

am 8b6b7d06: am f93ffd99: am e1bc5ddb: Add the RTL support to VectorDrawable.

* commit '8b6b7d061950665c010cd9c0fc63f6763b478739':
Add the RTL support to VectorDrawable.

commit | commitdiff | tree

John Reck [Thu, 17 Jul 2014 21:05:16 +0000 (21:05 +0000)]

am 4bcefbed: am ff70ea07: am 47751fe1: Revert "Separate Canvas JNI code from the implementation."

* commit '4bcefbed129c6363188952e15f8cbd90ed76d536':
Revert "Separate Canvas JNI code from the implementation."

commit | commitdiff | tree

Winson Chung [Thu, 17 Jul 2014 21:05:12 +0000 (21:05 +0000)]

am 1edec02d: am 1a1fa42b: am 1e214f1d: Fixing regression in flinging not updating the stack. (Bug 16371020)

* commit '1edec02de7397c8899af8d97797190c94032ce0d':
Fixing regression in flinging not updating the stack. (Bug 16371020)

commit | commitdiff | tree

Adam Connors [Thu, 17 Jul 2014 21:05:08 +0000 (21:05 +0000)]

am 23439bb9: am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev

* commit '23439bb9f3edcd2191aff79d57018ddaf2d74847':
Create DPM APIs for cross profile callerId

commit | commitdiff | tree

Niels Egberts [Thu, 17 Jul 2014 21:05:05 +0000 (21:05 +0000)]

am bc9d4124: (-s ours) am 64b0ebfc: am a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev

* commit 'bc9d4124b0679c342547011b2881fd637e755bf8':
TtsSpan builders for each TtsSpan type. DO NOT MERGE

commit | commitdiff | tree

Nancy Chen [Thu, 17 Jul 2014 21:05:00 +0000 (21:05 +0000)]

am 3a1fed97: am 74e775a5: am 4a9b99f5: API changes to enable account selection for a call

* commit '3a1fed9733a1bd6182ba5684cc59178c61874e59':
API changes to enable account selection for a call

commit | commitdiff | tree

Craig Mautner [Thu, 17 Jul 2014 21:04:56 +0000 (21:04 +0000)]

am 06d429a2: am 96de06e6: am b1c0b008: Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev

* commit '06d429a2b6b2658028c5f32b6ca6307a549b3905':
Wait for all windows to draw before turning screen on

commit | commitdiff | tree

Martin Kosiba [Thu, 17 Jul 2014 21:04:53 +0000 (21:04 +0000)]

am 6239ed0c: am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager.

* commit '6239ed0c67b2e981e80e9eac29d9aecd01a99cda':
Allow for appending of resources to an AssetManager.

commit | commitdiff | tree

Alexandra Gherghina [Thu, 17 Jul 2014 21:04:49 +0000 (21:04 +0000)]

am ea887ed3: am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager

* commit 'ea887ed3d19f744c83effb13347bc0a69e75f005':
Ads per-user APIs to manage accounts through the AccountManager

commit | commitdiff | tree

Amith Yamasani [Thu, 17 Jul 2014 21:04:45 +0000 (21:04 +0000)]

am 75fb30c4: am 9f831baf: am 467bc0ef: Merge "Keep track of user_setup_complete in DPMS" into lmp-dev

* commit '75fb30c47d9b13d6135e00d3b9c98b5b3e94459f':
Keep track of user_setup_complete in DPMS

commit | commitdiff | tree

Jae Seo [Thu, 17 Jul 2014 21:04:40 +0000 (21:04 +0000)]

am 446039d7: am 77da1b05: am f977db2e: Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev

* commit '446039d7acb0b06f3c8e00c4704e7c417393a2d5':
TIF: Add TvInputInfo.getParentId

commit | commitdiff | tree

Kenny Guy [Thu, 17 Jul 2014 21:04:36 +0000 (21:04 +0000)]

am d12ebe55: am 0dfd3e04: am 41482465: Merge "Allow app restrictions for uninstalled packages." into lmp-dev

* commit 'd12ebe550605d70eb723429431e734563609c117':
Allow app restrictions for uninstalled packages.

commit | commitdiff | tree

Chris Craik [Thu, 17 Jul 2014 21:04:32 +0000 (21:04 +0000)]

am 3b471660: am 41157d33: am ec9c58c1: Merge "Initializing variables - generally a good practice" into lmp-dev

* commit '3b471660d1e8d0f2a89df31376209c7b725fbf04':
Initializing variables - generally a good practice

commit | commitdiff | tree

Sandeep Siddhartha [Thu, 17 Jul 2014 20:58:22 +0000 (20:58 +0000)]

am 15cafc26: am 4b360037: Support model deletion

* commit '15cafc26085a0de7767db4d9000f588b1a4409f6':
Support model deletion

commit | commitdiff | tree

Craig Mautner [Thu, 17 Jul 2014 20:58:17 +0000 (20:58 +0000)]

am 73c69b27: am c2d339a6: Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev

* commit '73c69b2727b311d12f1ca8ad197db7cbe83d162c':
Additional cleanup after stack deletion.

commit | commitdiff | tree

Adrian Roos [Thu, 17 Jul 2014 20:58:13 +0000 (20:58 +0000)]

am 627e93b0: am 26f08cdc: Merge "QS Guest fixes" into lmp-dev

* commit '627e93b0ad11ec90309ca9f5fd69b426696b3069':
QS Guest fixes

commit | commitdiff | tree

Christopher Tate [Thu, 17 Jul 2014 20:58:09 +0000 (20:58 +0000)]

am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback

* commit '5763ad39f5cb5923b910c7cbd834707f65043bde':
Add BackupAgent.onRestoreFinished() callback

commit | commitdiff | tree

ztenghui [Thu, 17 Jul 2014 20:58:05 +0000 (20:58 +0000)]

am f93ffd99: am e1bc5ddb: Add the RTL support to VectorDrawable.

* commit 'f93ffd9941c5a4e5c7b256cab6da027f2457063c':
Add the RTL support to VectorDrawable.

commit | commitdiff | tree

John Reck [Thu, 17 Jul 2014 20:58:01 +0000 (20:58 +0000)]

am ff70ea07: am 47751fe1: Revert "Separate Canvas JNI code from the implementation."

* commit 'ff70ea07c2e167a0b66624f7b69068c826c74008':
Revert "Separate Canvas JNI code from the implementation."

commit | commitdiff | tree

Winson Chung [Thu, 17 Jul 2014 20:57:58 +0000 (20:57 +0000)]

am 1a1fa42b: am 1e214f1d: Fixing regression in flinging not updating the stack. (Bug 16371020)

* commit '1a1fa42b9502dc3c95e0103505b276083a2a5692':
Fixing regression in flinging not updating the stack. (Bug 16371020)

commit | commitdiff | tree

Adam Connors [Thu, 17 Jul 2014 20:57:53 +0000 (20:57 +0000)]

am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev

* commit 'bab7ceaf157a81d18ee1404bb6a17c6c05549f5b':
Create DPM APIs for cross profile callerId

commit | commitdiff | tree

Niels Egberts [Thu, 17 Jul 2014 20:57:50 +0000 (20:57 +0000)]

am 64b0ebfc: am a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev

* commit '64b0ebfcf9644c99d70e639eee14536e9f64484f':
TtsSpan builders for each TtsSpan type. DO NOT MERGE

commit | commitdiff | tree

Nancy Chen [Thu, 17 Jul 2014 20:57:46 +0000 (20:57 +0000)]

am 74e775a5: am 4a9b99f5: API changes to enable account selection for a call

* commit '74e775a56ce0af604f0b8bd493d270c4f15bacc9':
API changes to enable account selection for a call

commit | commitdiff | tree

Craig Mautner [Thu, 17 Jul 2014 20:57:42 +0000 (20:57 +0000)]

am 96de06e6: am b1c0b008: Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev

* commit '96de06e63e63fa66c4c5b419164c74b512d00ae8':
Wait for all windows to draw before turning screen on

commit | commitdiff | tree

Martin Kosiba [Thu, 17 Jul 2014 20:57:38 +0000 (20:57 +0000)]

am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager.

* commit 'fbb2246c6d72d98452fcda9b6a79689012eb5614':
Allow for appending of resources to an AssetManager.

commit | commitdiff | tree

Alexandra Gherghina [Thu, 17 Jul 2014 20:57:31 +0000 (20:57 +0000)]

am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager

* commit '14b5a9b452d8b47617f5d908778caaf745527fe9':
Ads per-user APIs to manage accounts through the AccountManager

commit | commitdiff | tree

Amith Yamasani [Thu, 17 Jul 2014 20:57:27 +0000 (20:57 +0000)]

am 9f831baf: am 467bc0ef: Merge "Keep track of user_setup_complete in DPMS" into lmp-dev

* commit '9f831baf7b1b53029f1112d9bc3d91c10fe26479':
Keep track of user_setup_complete in DPMS

commit | commitdiff | tree

Jae Seo [Thu, 17 Jul 2014 20:57:23 +0000 (20:57 +0000)]

am 77da1b05: am f977db2e: Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev

* commit '77da1b0585a69bd931cd167576462775b7b52e68':
TIF: Add TvInputInfo.getParentId

commit | commitdiff | tree

Kenny Guy [Thu, 17 Jul 2014 20:57:19 +0000 (20:57 +0000)]

am 0dfd3e04: am 41482465: Merge "Allow app restrictions for uninstalled packages." into lmp-dev

* commit '0dfd3e04f5da364e3500d3848ba3d21b3215716e':
Allow app restrictions for uninstalled packages.

commit | commitdiff | tree

Chris Craik [Thu, 17 Jul 2014 20:57:15 +0000 (20:57 +0000)]

am 41157d33: am ec9c58c1: Merge "Initializing variables - generally a good practice" into lmp-dev

* commit '41157d33a939dd8b3cc876a4c95b3ba561dd3ff3':
Initializing variables - generally a good practice

commit | commitdiff | tree

Jeff Davidson [Thu, 17 Jul 2014 18:29:21 +0000 (18:29 +0000)]

am 9f0e0984: am 2e803f18: am 14648e40: Merge "Restrict SCORE_NETWORKS permission to signature|system." into lmp-dev

* commit '9f0e09843c52a6d413d8d987fea3c50af8e02b6e':
Restrict SCORE_NETWORKS permission to signature|system.

commit | commitdiff | tree

Julia Reynolds [Thu, 17 Jul 2014 18:29:16 +0000 (18:29 +0000)]

am 6a1230cf: am d7dd3073: am 9c9cb566: Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev

* commit '6a1230cfcc8f6c9920d06e6ac2ec8dcf39903cf2':
Update message on DISALLOW_REMOVE_USERS constant.

commit | commitdiff | tree

Torne (Richard Coles) [Thu, 17 Jul 2014 18:29:12 +0000 (18:29 +0000)]

am a6eb6ece: am 8829ffe0: am 07119f4a: Use the WebView\'s loader library to load the real library.

* commit 'a6eb6eceb0330508af47f4de697df7c7b85e5410':
Use the WebView's loader library to load the real library.
Remove WebView library preloading mechanism.

commit | commitdiff | tree

John Spurlock [Thu, 17 Jul 2014 18:29:08 +0000 (18:29 +0000)]

am 2c38f004: am 799443c0: am 1ae06eb3: Merge "Zen: Maintain selection throughout rocker session." into lmp-dev

* commit '2c38f0045528f268f4b241235b2d05f8ec920b36':
Zen: Maintain selection throughout rocker session.

commit | commitdiff | tree

John Spurlock [Thu, 17 Jul 2014 18:29:03 +0000 (18:29 +0000)]

am 8f4d5a08: am 58ac4ba9: am f0580c6e: Merge "Shade: Hide the status icons from the collapsed header." into lmp-dev

* commit '8f4d5a088db4e5eec71c001ebb347df9aeaf96d6':

commit | commitdiff | tree

Przemyslaw Szczepaniak [Thu, 17 Jul 2014 18:28:59 +0000 (18:28 +0000)]

am c9b3af99: am 90d78fa4: am 95546693: Merge "Add AudioAttributes support in the TTS." into lmp-dev

* commit 'c9b3af99fc96b9929886b2e03aca7c036ec5031e':

commit | commitdiff | tree

John Spurlock [Thu, 17 Jul 2014 18:28:54 +0000 (18:28 +0000)]

am a772e67d: am 649eea00: am 791c827c: Merge "Zen: Return of the alarm warning." into lmp-dev

* commit 'a772e67dd075b1c8e1b18ba81901a3b559bba5d4':

commit | commitdiff | tree

Kenny Guy [Thu, 17 Jul 2014 18:28:50 +0000 (18:28 +0000)]

am 678bfc71: am bad2ccf9: am 6ec1e21d: Merge "Check for exported and category before starting activity." into lmp-dev

* commit '678bfc713fc5e8ced495d9682569c635a2329aee':

commit | commitdiff | tree

Nicolas Prevot [Thu, 17 Jul 2014 18:28:46 +0000 (18:28 +0000)]

am 945ca8d4: (-s ours) am a2a8501e: am 9a4cf569: DO NOT MERGE

* commit '945ca8d4088bf87bd06a8f9529061bb6f6c52c18':

commit | commitdiff | tree

Filip Gruszczynski [Thu, 17 Jul 2014 18:28:42 +0000 (18:28 +0000)]

am 9cf6565d: am 6dc90f73: am e26a2536: am 95198b91: am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev

* commit '9cf6565d5b90baaeb28336857c0dfc149b354b09':

commit | commitdiff | tree

Adrian Roos [Thu, 17 Jul 2014 18:28:37 +0000 (18:28 +0000)]

am 6832fc19: am f693c9c3: am 3e7b4279: Merge "Update QS user switcher colors to spec" into lmp-dev

* commit '6832fc1996ead7183f64a24205340985c7294a90':

commit | commitdiff | tree

Adrian Roos [Thu, 17 Jul 2014 18:28:33 +0000 (18:28 +0000)]

am 705c6956: am b00b4be5: am 221433ab: Merge "Partially fix the keyguard scrim" into lmp-dev

* commit '705c695614be2b205a3190ed59a7ccc1ebb0e87c':

commit | commitdiff | tree

Dianne Hackborn [Thu, 17 Jul 2014 18:28:28 +0000 (18:28 +0000)]

am be872f85: am 2a96a389: am cf3580b0: Merge "Fix build." into lmp-dev

* commit 'be872f85f799b54ca78a468f4489cee99ecbb118':

commit | commitdiff | tree

Chulwoo Lee [Thu, 17 Jul 2014 18:28:24 +0000 (18:28 +0000)]

am 975d2656: am 44cafdc7: am 62572cab: Merge "Pass input ID to the setup/settings activity" into lmp-dev

* commit '975d2656e851795507a148200390756e410e85c6':

commit | commitdiff | tree

Chulwoo Lee [Thu, 17 Jul 2014 18:28:10 +0000 (18:28 +0000)]

am 7d43cc04: am 3493ee3c: am 02023167: Merge "Introduce "input_id" column to the channels table" into lmp-dev

* commit '7d43cc041395c4d8362f365fdffe50f8aed4e19c':

commit | commitdiff | tree

Dianne Hackborn [Thu, 17 Jul 2014 18:28:04 +0000 (18:28 +0000)]

am 030cab7d: am 68f35ec2: am dbec91c0: Implement issue #16330060: Inform ActivityManager about WebView...

* commit '030cab7d9832cf362defc1a31f09fd03ab8d5829':

commit | commitdiff | tree

Sandeep Siddhartha [Thu, 17 Jul 2014 18:28:00 +0000 (18:28 +0000)]

am eaae09ef: am e08cd87e: am 47ecf354: Plumb the database code to read/update sound models

* commit 'eaae09ef1d910c6df24736a7d53004757f822f2c':

commit | commitdiff | tree

Sandeep Siddhartha [Thu, 17 Jul 2014 18:27:55 +0000 (18:27 +0000)]

am 00fe9626: am bb80d295: am aecd5383: Add recognition modes to the enrollment metadata

* commit '00fe9626d1fa58d51cac20937749672f17b9477e':

commit | commitdiff | tree

Alan Viverette [Thu, 17 Jul 2014 18:27:51 +0000 (18:27 +0000)]

am fea72d05: am 4366255e: am bbbbb3b2: Add public attributes for TimePicker styling

* commit 'fea72d056cbde8c65f8dcca5477cbcc542fc8258':

commit | commitdiff | tree

Dan Sandler [Thu, 17 Jul 2014 18:27:46 +0000 (18:27 +0000)]

am 7df08e32: am 24b3cab7: am ce4dc71c: Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev

* commit '7df08e326909c7f8058ea4e87d105547d7490597':

commit | commitdiff | tree

John Spurlock [Thu, 17 Jul 2014 18:27:39 +0000 (18:27 +0000)]

am 13f468d6: am 11d850c1: am efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev

* commit '13f468d678168b8300c451552c304dc20e4afc2e':

commit | commitdiff | tree

Sandeep Siddhartha [Thu, 17 Jul 2014 18:27:35 +0000 (18:27 +0000)]

am fce38213: am a2440a17: am 43bc655b: Add code for isKeyphraseActive and some logging to help debug issues

* commit 'fce382131f7e9a54a3141e3ce8a894d069ed0fab':

commit | commitdiff | tree

John Spurlock [Thu, 17 Jul 2014 18:27:30 +0000 (18:27 +0000)]

am 1786b341: am 7aeea625: am 45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev

* commit '1786b341df34080ce41b35b06acbe8a1984151c5':

commit | commitdiff | tree

Amith Yamasani [Thu, 17 Jul 2014 18:27:25 +0000 (18:27 +0000)]

am 7684f6e6: am d63203df: am b31b07c8: Merge "Allow content provider access across users" into lmp-dev

* commit '7684f6e6a1618ec05ef82a7b303f13120bf8cb05':

commit | commitdiff | tree

Lorenzo Colitti [Thu, 17 Jul 2014 18:27:13 +0000 (18:27 +0000)]

am bebc331c: am 84641420: am 1098531c: Disable logging in NetlinkTracker.

* commit 'bebc331c3f29aeffef4fbfce897ff56b61422e3a':

commit | commitdiff | tree

Chris Craik [Thu, 17 Jul 2014 18:27:09 +0000 (18:27 +0000)]

am 845a565b: am 3e95764e: am b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev

* commit '845a565b5477a3e91849bb6c992940cde4d105d2':

commit | commitdiff | tree

Santos Cordon [Thu, 17 Jul 2014 18:27:05 +0000 (18:27 +0000)]

am afa48d41: am f6eaf614: am ec82a805: Add toString & equals helper methods to PhoneAccount.java

* commit 'afa48d41ca09077e9d2b3e51fe06d428d1244fed':

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Jul 2014 18:27:00 +0000 (18:27 +0000)]

am cca1eafd: (-s ours) am 0781731f: (-s ours) am 54639300: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'cca1eafdcff88a1e2ba883ae7bffe338528c40cd':

commit | commitdiff | tree

John Spurlock [Thu, 17 Jul 2014 18:26:55 +0000 (18:26 +0000)]

am 814a6c4c: am 02d9aa3f: am fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev

* commit '814a6c4c636e84324d5d1401f668d44cf6388337':

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Jul 2014 18:26:51 +0000 (18:26 +0000)]

am 3f4fe51f: (-s ours) am afdeebdd: (-s ours) am 9988df29: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '3f4fe51f3b8f3192cd503fdae482c3419d884190':

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Jul 2014 18:26:46 +0000 (18:26 +0000)]

am dbb81959: (-s ours) am 95b45b1f: (-s ours) am da616efd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'dbb819599846d805ca4eea9b0dc6d6ad06488823':

commit | commitdiff | tree

Jungshik Jang [Thu, 17 Jul 2014 18:26:41 +0000 (18:26 +0000)]

am 759b53da: am d26e2a0c: am 6d98d91f: Merge "Hook up system audio mode" into lmp-dev

* commit '759b53dad6bb06aa254be113bcc017b6b6c82b1e':

commit | commitdiff | tree

Dianne Hackborn [Thu, 17 Jul 2014 18:26:37 +0000 (18:26 +0000)]

am 3c339991: am d8f0526c: am 8b353ef1: Merge "Maybe fix issue #16167054: Wakelock is acquired and released in..." into lmp-dev

* commit '3c33999150873c0c7866567ff674ef93120eafcf':

commit | commitdiff | tree

Vinit Deshpande [Thu, 17 Jul 2014 18:26:32 +0000 (18:26 +0000)]

am 2a0e874c: am ff5ceb0d: am 0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev

* commit '2a0e874c5e56302b43f4b9189cd6bf7dc7834abc':

commit | commitdiff | tree

Chelsea Derrick [Thu, 17 Jul 2014 18:26:27 +0000 (18:26 +0000)]

am eed3237c: (-s ours) am 4e9ef0aa: am 52c8bd50: Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev

* commit 'eed3237c8ffd8f724b0e72e9209adb5b4209763f':

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Jul 2014 18:26:22 +0000 (18:26 +0000)]

am 68bde9d4: (-s ours) am e2a2b37a: (-s ours) am 6b7e527a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '68bde9d4e312d17f93e4ec60aac3e0ad0a6046f0':

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Jul 2014 18:26:16 +0000 (18:26 +0000)]

am 7e81d2e1: (-s ours) am 6719bbd1: (-s ours) am ca0db50a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7e81d2e1521bf62429ea9995a346a29bcf5c05bb':

commit | commitdiff | tree

Baligh Uddin [Thu, 17 Jul 2014 18:26:11 +0000 (18:26 +0000)]

am 7e8aefc0: (-s ours) am 15ae6bc7: (-s ours) am 2b8858a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7e8aefc0af0eec8a9e5edea4e0a2bbb8c6df9cd0':

commit | commitdiff | tree

Jeff Davidson [Thu, 17 Jul 2014 18:26:07 +0000 (18:26 +0000)]

am 08f7e88a: am 62152268: Merge "Expose network scoring APIs to /system apps." into lmp-dev

* commit '08f7e88aa84dba10f80c2e517c6fa13db7c1723f':

commit | commitdiff | tree

Jungshik Jang [Thu, 17 Jul 2014 18:26:00 +0000 (18:26 +0000)]

am 5ed43db6: am 3ac63bd8: Revisit HDMI-CEC system audio mode in AudioService.

* commit '5ed43db61559ad753faced89268dbaa473ec629c':

commit | commitdiff | tree

Robert Greenwalt [Thu, 17 Jul 2014 18:25:55 +0000 (18:25 +0000)]

am 3c5dacac: am 004a427e: Merge "Make a network the default when it connects if we have no default." into lmp-dev

* commit '3c5dacace453a3b7d02b6198fd00c7d5871c6688':

commit | commitdiff | tree

Brian Colonna [Thu, 17 Jul 2014 18:25:51 +0000 (18:25 +0000)]

am 7f3fc114: am 6f6fcecb: Bug 16152902: Disabling FUL in keyguard and screen lock settings

* commit '7f3fc11451e3787a0453d80703178477c7f55495':

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 17 Jul 2014 18:25:46 +0000 (18:25 +0000)]

am b1144cff: am 6bbea8cf: Fix LocalePicker background

* commit 'b1144cff1b1139d57a8489eda81540cc72530bff':

commit | commitdiff | tree

Ye Wen [Thu, 17 Jul 2014 18:25:42 +0000 (18:25 +0000)]

am 8598bda9: am 0353e451: Merge "Unhide new MMS API and SMS storage API (1/2)" into lmp-dev

* commit '8598bda9002f16e23ac08eb54a98978dca7b844c':

commit | commitdiff | tree

Robert Shih [Thu, 17 Jul 2014 18:25:37 +0000 (18:25 +0000)]

am 3b63090d: am 5f48c625: MediaRecorder: added constants for WEBM output

* commit '3b63090d5f1ea9201f4a5953ba1a0fc181994e4b':

commit | commitdiff | tree

Eric Laurent [Thu, 17 Jul 2014 18:25:32 +0000 (18:25 +0000)]

am 136bee9d: am aaaa07c2: Merge "AudioService: Use device specific mode to open SCO audio" into lmp-dev

* commit '136bee9ddd36cb9cc8d1b95ec5c45ebc688d65dd':

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 17 Jul 2014 18:25:28 +0000 (18:25 +0000)]

am f48206de: am bfe21a64: Fix bug #16353909 Preferences RTL support is sometimes broken

* commit 'f48206de3bd2251618f7ceb3a67f0c74c688e1c5':

commit | commitdiff | tree

Chelsea Derrick [Thu, 17 Jul 2014 18:25:24 +0000 (18:25 +0000)]

am c581c3da: (-s ours) am 42a0114c: Merge "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]" into lmp-dev

* commit 'c581c3dac2f576dc0301826c04a1761b01bd26ac':

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 17 Jul 2014 18:25:20 +0000 (18:25 +0000)]

am 92cfbbe0: am b56e3cad: Fix #16348486 [RTL] Checkboxes are improperly aligned

* commit '92cfbbe0e003e1b988b453216206cbfcef00ee6f':

commit | commitdiff | tree

Alan Viverette [Thu, 17 Jul 2014 18:25:16 +0000 (18:25 +0000)]

am eec997ca: am 8e97a200: Fix software dirty region, don\'t add insets to software windows

* commit 'eec997ca5c0acf59502cf1ded08e1d6432d9d82c':

commit | commitdiff | tree

Yigit Boyar [Thu, 17 Jul 2014 18:25:11 +0000 (18:25 +0000)]

am d497e541: am d8607b40: Merge "Change Animators to reset values when restarted if their target changes" into lmp-dev

* commit 'd497e5419fcbd5a933a1c736ed939a2121039fb0':

commit | commitdiff | tree

John Reck [Thu, 17 Jul 2014 18:25:07 +0000 (18:25 +0000)]

am 645f72ad: am c1d32f0c: Merge "Fix root RenderNode damage calculation" into lmp-dev

* commit '645f72ad0c0803973902d69bd7f8d58dcc1ebbc7':

commit | commitdiff | tree

Stuart Scott [Thu, 17 Jul 2014 18:25:03 +0000 (18:25 +0000)]

am 4b564e73: am b8948923: Merge "MSIM: dump sub specific info" into lmp-dev

* commit '4b564e733f8cf3ec01ce7a3634a4dd54fc2c9400':

commit | commitdiff | tree

kmccormick [Thu, 17 Jul 2014 18:24:58 +0000 (18:24 +0000)]

am 478b82f8: am 7a0ace2d: am 1f4e5686: am 289d3c25: am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs

* commit '478b82f895c902c0d668fe97bb3ebe7cbf5236b5':

commit | commitdiff | tree

David Friedman [Thu, 17 Jul 2014 18:24:55 +0000 (18:24 +0000)]

am 282d44b1: am a4690c90: am 8b51d07f: am a827c738: am 046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored.

* commit '282d44b1762f769ffa4253e8edb9c0ff1242c84f':

commit | commitdiff | tree

Sailesh Nepal [Thu, 17 Jul 2014 18:24:50 +0000 (18:24 +0000)]

am dc64a5fa: am 03e88771: TTY: frameworks/base changes

* commit 'dc64a5fa6d28e44ab2e5131d7e1e4714967441d1':

commit | commitdiff | tree

Christopher Tate [Thu, 17 Jul 2014 18:24:46 +0000 (18:24 +0000)]

am 05502b3c: am c92b1dd5: Merge "Always call finishBackup() if performFullBackup() succeeded" into lmp-dev

* commit '05502b3c3967c06fc0548c284b3b70e4c0201308':

commit | commitdiff | tree

Jeff Sharkey [Thu, 17 Jul 2014 18:24:41 +0000 (18:24 +0000)]

am dcf9bb82: am 2158503f: Merge "Install sessions only inherit APK files." into lmp-dev

* commit 'dcf9bb8222f73777b45e3f1c1aab1d7b3d1adbd2':

commit | commitdiff | tree

Shishir Agrawal [Thu, 17 Jul 2014 18:24:36 +0000 (18:24 +0000)]

am f8e585e4: am 38c365d0: Merge "Unhiding the SMS/MMS APIs for injection/transport." into lmp-dev

* commit 'f8e585e462f38d80a571e2def7bba24f9be4e52f':

commit | commitdiff | tree

Sharvil Nanavati [Thu, 17 Jul 2014 18:24:32 +0000 (18:24 +0000)]

am ca0fd698: am 3afc825a: Launch processes running under the \'bluetooth\' uid with CAP_WAKE_ALARM.

* commit 'ca0fd698587d6cdb576557c7d53a3a8cc8cf5c82':

commit | commitdiff | tree

Alan Viverette [Thu, 17 Jul 2014 18:24:25 +0000 (18:24 +0000)]

am e0bc6218: am ca27046e: Merge "Fix state list drawable transitions" into lmp-dev

* commit 'e0bc6218f3f7d6eea6b7d57b8e21a4c02805787e':

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 17 Jul 2014 18:24:21 +0000 (18:24 +0000)]

am 47519491: am fd6eeda0: Fix bug #16309454 Broken recent button after dismissing set time dialog

* commit '475194913a01b9301015302f907bd17ebe974724':

commit | commitdiff | tree

Jeff Davidson [Thu, 17 Jul 2014 18:24:17 +0000 (18:24 +0000)]

am 01a5e054: am 8f406122: Remove obsolete remark from XXHDPI comment.

* commit '01a5e054b8383078c753f163e143baac67c8b041':

commit | commitdiff | tree

David Friedman [Thu, 17 Jul 2014 18:24:12 +0000 (18:24 +0000)]

am 589eba27: am 6ec875ea: am c6474d97: am fe545cdb: A linebreak had somehow wrongly replaced a blank space. Blank space restored.

* commit '589eba27f69b7481a27ef0bb168013c4016e09b0':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 17 Jul 2014 18:24:07 +0000 (18:24 +0000)]

am 71f28601: (-s ours) am f9c7a0ab: Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]

* commit '71f28601c4d1d4a4fc88372438aaa7b281a44329':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 17 Jul 2014 18:24:00 +0000 (18:24 +0000)]

am bc48b92f: (-s ours) am 08f4aef0: Optimize Blend composites. [DO NOT MERGE]

* commit 'bc48b92f941c168bc08d4edf79aad696a1e3aaee':