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

Dongwon Kang [Mon, 5 Jan 2015 01:20:39 +0000 (01:20 +0000)]

Merge "TIF: Add a null checking in TvInputHardwareManager."

Sungsoo Lim [Mon, 5 Jan 2015 00:08:34 +0000 (09:08 +0900)]

Fix typo

Change-Id: I0c738602616fda510b765e03f8a25abfc8316b84

Jinsuk Kim [Sat, 3 Jan 2015 21:27:36 +0000 (21:27 +0000)]

am 270686b6: am ad1e3d7d: CEC: Buffer <Set System Audio Mode>
automerge: e82e47e

* commit 'e82e47e9cb01a19e88a89f8a43a7a15540b96869':
CEC: Buffer <Set System Audio Mode>

commit | commitdiff | tree

Jinsuk Kim [Sat, 3 Jan 2015 21:25:40 +0000 (21:25 +0000)]

am 270686b6: am ad1e3d7d: CEC: Buffer <Set System Audio Mode>

* commit '270686b681e74622a09bb3081b1e03c55f692c3f':
CEC: Buffer <Set System Audio Mode>

commit | commitdiff | tree

Jinsuk Kim [Sat, 3 Jan 2015 21:20:30 +0000 (21:20 +0000)]

am ad1e3d7d: CEC: Buffer <Set System Audio Mode>

* commit 'ad1e3d7df42376cd2a257b6c3b2fed540658a6e3':
CEC: Buffer <Set System Audio Mode>

commit | commitdiff | tree

Narayan Kamath [Fri, 2 Jan 2015 10:36:08 +0000 (10:36 +0000)]

am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"
automerge: 0699722

* commit '0699722a13c0a8cee6477dc88c843353f201d742':
fix issuse 65774

commit | commitdiff | tree

Narayan Kamath [Fri, 2 Jan 2015 10:34:03 +0000 (10:34 +0000)]

am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"

* commit '3d6cfe0eb1c9fcfabaf7b02548dd6d5cc16203d6':
fix issuse 65774

commit | commitdiff | tree

Narayan Kamath [Fri, 2 Jan 2015 10:28:22 +0000 (10:28 +0000)]

am 873b291b: Merge "fix issuse 65774"

* commit '873b291b15c35ae1ec7ea29de4c012275e13e761':
fix issuse 65774

commit | commitdiff | tree

Narayan Kamath [Fri, 2 Jan 2015 10:22:20 +0000 (10:22 +0000)]

Merge "fix issuse 65774"

commit | commitdiff | tree

Paul Quei [Wed, 19 Mar 2014 07:18:54 +0000 (15:18 +0800)]

fix issuse 65774

"Some vendors have there own well defined specifications ...". Should be "Some vendors have their own well defined specifications ..."

Change-Id: I0d770ac0591812c1c61389eb0078493098784323
Signed-off-by: Paul Quei <paulquei@gmail.com>

commit | commitdiff | tree

Jinsuk Kim [Fri, 2 Jan 2015 04:27:15 +0000 (13:27 +0900)]

CEC: Buffer <Set System Audio Mode>

<Set System Audio Mode> is another command that needs to be buffered
in case the command arrives before the system is ready to process it.
When processed, system audio mode will be enabled based on the
global setting.

Bug: 18809965

Change-Id: Ia6ebc4e2919e1b94498ca28f652c6db95f907f9c

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Dec 2014 19:16:03 +0000 (11:16 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Robin Lee [Wed, 31 Dec 2014 13:59:29 +0000 (13:59 +0000)]

Merge "Remove deprecated upgrade path for relatedGroupId"

commit | commitdiff | tree

Narayan Kamath [Wed, 31 Dec 2014 10:21:39 +0000 (10:21 +0000)]

am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."
automerge: bdc3992

* commit 'bdc399299edf7f5f86c816dafe581e85e65dd2bd':
Remove hardcoded include paths.

commit | commitdiff | tree

Narayan Kamath [Wed, 31 Dec 2014 10:19:00 +0000 (10:19 +0000)]

am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths."

* commit 'd3d95172c3645a1d7a12e540638207ae4fb69cae':
Remove hardcoded include paths.

commit | commitdiff | tree

Narayan Kamath [Wed, 31 Dec 2014 10:13:23 +0000 (10:13 +0000)]

am 38c2dae5: Merge "Remove hardcoded include paths."

* commit '38c2dae5f12003ff39a5b1a5e46f079174fcedca':
Remove hardcoded include paths.

commit | commitdiff | tree

Narayan Kamath [Wed, 31 Dec 2014 10:08:47 +0000 (10:08 +0000)]

Merge "Remove hardcoded include paths."

commit | commitdiff | tree

Narayan Kamath [Tue, 30 Dec 2014 11:53:25 +0000 (11:53 +0000)]

Remove hardcoded include paths.

ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.

bug: 18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18

commit | commitdiff | tree

Michael Wright [Tue, 30 Dec 2014 20:59:10 +0000 (12:59 -0800)]

resolve merge conflicts of 342e903 to master.

Change-Id: Id8404cce5c1c8e7818e5d164f93207a8c17cf7bb

commit | commitdiff | tree

Michael Wright [Tue, 30 Dec 2014 19:51:20 +0000 (19:51 +0000)]

am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev

* commit '95700457139803af54a5e731816cedf1c924f3a6':
Add MEDIA_PROJECTION_SERVICE to the ServiceName list.

commit | commitdiff | tree

Michael Wright [Tue, 30 Dec 2014 19:45:47 +0000 (19:45 +0000)]

am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev

* commit 'a33424a540ea725d4b513ee713931c66e62721a2':
Add MEDIA_PROJECTION_SERVICE to the ServiceName list.

commit | commitdiff | tree

Michael Wright [Tue, 30 Dec 2014 19:40:50 +0000 (19:40 +0000)]

Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev

commit | commitdiff | tree

Robin Lee [Tue, 30 Dec 2014 17:36:00 +0000 (17:36 +0000)]

Remove deprecated upgrade path for relatedGroupId

As per note this has been unused for upwards of 6 months and its
attribute string is no longer referenced anywhere else in Android.

Change-Id: I5f95ffa6b3d91fca203f2d030d40df3fd55b6a70

commit | commitdiff | tree

Narayan Kamath [Tue, 30 Dec 2014 12:32:40 +0000 (12:32 +0000)]

am a4c40c37: am 72d33849: Merge "Missing break in switch statement"
automerge: 4d72e3e

* commit '4d72e3e07e23fb13d4ba7f97f4c088948fef3e64':
Missing break in switch statement

commit | commitdiff | tree

Narayan Kamath [Tue, 30 Dec 2014 12:29:38 +0000 (12:29 +0000)]

am a4c40c37: am 72d33849: Merge "Missing break in switch statement"

* commit 'a4c40c373477983622622186946d21802400876e':
Missing break in switch statement

commit | commitdiff | tree

Narayan Kamath [Tue, 30 Dec 2014 12:20:56 +0000 (12:20 +0000)]

am 72d33849: Merge "Missing break in switch statement"

* commit '72d33849fea5de45087bfa79e645fa282ce8fcef':
Missing break in switch statement

commit | commitdiff | tree

Narayan Kamath [Tue, 30 Dec 2014 09:43:00 +0000 (09:43 +0000)]

Merge "Missing break in switch statement"

commit | commitdiff | tree

Marvin Paul [Tue, 30 Dec 2014 03:18:54 +0000 (03:18 +0000)]

Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev automerge: a30fdf7 automerge: 8298afb
automerge: 9ff2160

* commit '9ff2160eddf4dfbd118eb9b0656e7803603f215a':
Don't backup ringtone on non-telephony devices.

commit | commitdiff | tree

Marvin Paul [Tue, 30 Dec 2014 03:15:55 +0000 (03:15 +0000)]

Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev automerge: a30fdf7
automerge: 8298afb

* commit '8298afbc78f2b2c609f2e52ca3fc7c6a2cd9797e':
Don't backup ringtone on non-telephony devices.

commit | commitdiff | tree

Marvin Paul [Tue, 30 Dec 2014 00:53:52 +0000 (00:53 +0000)]

Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev
automerge: a30fdf7

* commit 'a30fdf790d66e241252c51d7dbdc401e021e51ad':
Don't backup ringtone on non-telephony devices.

commit | commitdiff | tree

Marvin Paul [Mon, 29 Dec 2014 23:18:15 +0000 (23:18 +0000)]

Merge "Don't backup ringtone on non-telephony devices." into lmp-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Dec 2014 22:56:32 +0000 (22:56 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Dec 2014 22:56:25 +0000 (22:56 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Dec 2014 21:22:41 +0000 (13:22 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Dec 2014 20:54:36 +0000 (12:54 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Glenn Kasten [Mon, 29 Dec 2014 19:08:22 +0000 (19:08 +0000)]

commit | commitdiff | tree

Glenn Kasten [Mon, 29 Dec 2014 19:08:01 +0000 (19:08 +0000)]

Merge "Update API documentation for static AudioTrack"

commit | commitdiff | tree

Andre Eisenbach [Mon, 29 Dec 2014 18:45:50 +0000 (18:45 +0000)]

am 1d23da91: am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev
automerge: d5e2fa0

* commit 'd5e2fa0bed602a1eb45afb41dc64a09d60e91a44':
Exclude unnecessary intents in SystemUI

commit | commitdiff | tree

Andre Eisenbach [Mon, 29 Dec 2014 18:42:03 +0000 (18:42 +0000)]

am 1d23da91: am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev

* commit '1d23da911a698ee1cc0503118f661ef0609ea8e9':
Exclude unnecessary intents in SystemUI

commit | commitdiff | tree

Andre Eisenbach [Mon, 29 Dec 2014 18:36:27 +0000 (18:36 +0000)]

am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev

* commit 'd7d9cdaebb30df5564b5787ee02d4624673c8523':
Exclude unnecessary intents in SystemUI

commit | commitdiff | tree

Svetoslav [Mon, 29 Dec 2014 18:32:28 +0000 (18:32 +0000)]

am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager.
automerge: 1261ee8

* commit '1261ee87a8c781c949d8fbbe4c7990963f5a3155':
Fix a race in accessibility manager.

commit | commitdiff | tree

Andre Eisenbach [Mon, 29 Dec 2014 18:32:20 +0000 (18:32 +0000)]

Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev

commit | commitdiff | tree

Svetoslav [Mon, 29 Dec 2014 18:30:47 +0000 (18:30 +0000)]

am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager.

* commit '72da9ed8867a3b3d6a9ae829b9a0ae526c16915c':
Fix a race in accessibility manager.

commit | commitdiff | tree

Svetoslav [Mon, 29 Dec 2014 18:23:54 +0000 (18:23 +0000)]

am e5ea48a7: Fix a race in accessibility manager.

* commit 'e5ea48a7fe295a2815bab57f2e870901ce48b312':
Fix a race in accessibility manager.

commit | commitdiff | tree

Svetoslav [Mon, 29 Dec 2014 17:40:42 +0000 (09:40 -0800)]

Fix a race in accessibility manager.

The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.

bug:18840784

Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 16:22:57 +0000 (16:22 +0000)]

am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings."
automerge: bf0c614

* commit 'bf0c614d33673a0a037e317c8c25ad2e6c24e77d':
Throw IllegalArgumentException on invalid hex-strings.

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 16:20:32 +0000 (16:20 +0000)]

am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings."

* commit 'c97d1fbbe00a91b1a67b7c526d9cf11ffec741fa':
Throw IllegalArgumentException on invalid hex-strings.

commit | commitdiff | tree

Glenn Kasten [Mon, 29 Dec 2014 16:17:56 +0000 (08:17 -0800)]

Fix build

Change-Id: I1119c37ac317d0ce86c53a6c134c664d2f1c2cb3

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 16:15:04 +0000 (16:15 +0000)]

am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings."

* commit '5106dd44f9e5877aee8e70711c026e9e23783d4c':
Throw IllegalArgumentException on invalid hex-strings.

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 16:08:32 +0000 (16:08 +0000)]

Merge "Throw IllegalArgumentException on invalid hex-strings."

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 12:21:25 +0000 (12:21 +0000)]

am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."
automerge: 1539c26

* commit '1539c267c7f4678434361b3fac3f56abcbb19f56':
Fixed grammar in the comment that introduces the Debug.MemoryInfo class.

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 12:20:16 +0000 (12:20 +0000)]

am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."

* commit 'be8053a23c0f0b15697176f0cd5e322b30d474e1':
Fixed grammar in the comment that introduces the Debug.MemoryInfo class.

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 12:14:41 +0000 (12:14 +0000)]

am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."

* commit '5ae63a258b78c4982a6c4ae984b86bb7b2db1dd4':
Fixed grammar in the comment that introduces the Debug.MemoryInfo class.

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 12:08:56 +0000 (12:08 +0000)]

Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 11:14:51 +0000 (11:14 +0000)]

am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing"
automerge: 1cc57ab

* commit '1cc57aba8128134f55b6d5e4f4800c51e3472828':
Fix "pm list permissions" crash if resource string missing

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 11:13:22 +0000 (11:13 +0000)]

am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing"

* commit '1bafd01a3fc5f94e77d1c18e5a7dcdecddcaa47f':
Fix "pm list permissions" crash if resource string missing

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 11:06:53 +0000 (11:06 +0000)]

am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing"

* commit '44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a':
Fix "pm list permissions" crash if resource string missing

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 11:01:27 +0000 (11:01 +0000)]

Merge "Fix "pm list permissions" crash if resource string missing"

commit | commitdiff | tree

Esteban Talavera [Mon, 29 Dec 2014 10:55:25 +0000 (10:55 +0000)]

Merge "Remove deprecated version of setProfileOwner that takes packageName"

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 10:15:50 +0000 (10:15 +0000)]

am 7d019394: am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""
automerge: 7e6ae35

* commit '7e6ae353f022426d52df77acca4d0ded58b939b5':
Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 10:12:55 +0000 (10:12 +0000)]

am 7d019394: am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""

* commit '7d019394f7ca2f047e9c3d2a98b5c23b223c6689':
Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 10:07:13 +0000 (10:07 +0000)]

am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""

* commit '712a02050e7be4479f12a81aeb23d7217b8d7a8d':
Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"

commit | commitdiff | tree

Narayan Kamath [Mon, 29 Dec 2014 10:02:26 +0000 (10:02 +0000)]

Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""

commit | commitdiff | tree

Sungsoo Lim [Mon, 29 Dec 2014 04:52:18 +0000 (04:52 +0000)]

Merge "Make mute/unmute work"

commit | commitdiff | tree

Sungsoo Lim [Wed, 24 Dec 2014 08:30:00 +0000 (17:30 +0900)]

Make mute/unmute work

Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb

commit | commitdiff | tree

Craig Mautner [Mon, 29 Dec 2014 01:59:28 +0000 (01:59 +0000)]

am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"
automerge: 3551ce9

* commit '3551ce9d8e8244376d63b65e0352ffa03198ba2a':
[ActivityManager] Reset ActivityRecord's waitingVisible

commit | commitdiff | tree

Craig Mautner [Mon, 29 Dec 2014 01:56:42 +0000 (01:56 +0000)]

am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"

* commit '443d1a6ae3b9550a4a1b46926b336c1a534db2f4':
[ActivityManager] Reset ActivityRecord's waitingVisible

commit | commitdiff | tree

Craig Mautner [Mon, 29 Dec 2014 01:44:25 +0000 (01:44 +0000)]

am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"

* commit 'cfa31a605cda26a556009ddd4eae83085e74339b':
[ActivityManager] Reset ActivityRecord's waitingVisible

commit | commitdiff | tree

Craig Mautner [Mon, 29 Dec 2014 01:30:49 +0000 (01:30 +0000)]

Merge "[ActivityManager] Reset ActivityRecord's waitingVisible"

commit | commitdiff | tree

John Spurlock [Sun, 28 Dec 2014 05:57:49 +0000 (05:57 +0000)]

am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev automerge: db41690
automerge: bbe3087

* commit 'bbe3087ec08b22bf3778e1ed77a0d6bfc13611a4':
Audio Policy: Clear calling identity for all paths setting ringer mode.

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:56:40 +0000 (05:56 +0000)]

am 45c6ae56: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: bedfb2f  -s ours
automerge: 3ab0f69  -s ours

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

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:55:15 +0000 (05:55 +0000)]

am 4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 378939f  -s ours
automerge: 98ff0fe  -s ours

* commit '98ff0febf4c93504f07b024aab4645b5ad5548ec':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:53:52 +0000 (05:53 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: c5d0323  -s ours
automerge: b19d7ef  -s ours

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

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:52:40 +0000 (05:52 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: b0e2d4c  -s ours
automerge: 4fa11af  -s ours

* commit '4fa11af7682f4b2776d7bc5bc934ef02f5a7901d':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Robin Lee [Sun, 28 Dec 2014 05:51:19 +0000 (05:51 +0000)]

am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev automerge: c9db16c
automerge: b6b7d42

* commit 'b6b7d4251cdab1843ae9b2ae167ac9276ada241e':
Revert "DevicePolicy: Don't warn about managed profile CAs"

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:49:55 +0000 (05:49 +0000)]

am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: cecabf4  -s ours
automerge: 4ac5f68  -s ours

* commit '4ac5f68b563b432a0728e430c42dafec4045631d':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:48:43 +0000 (05:48 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: f17490f  -s ours
automerge: fc9bedb  -s ours

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

commit | commitdiff | tree

Pavel Zhamaitsiak [Sun, 28 Dec 2014 05:47:12 +0000 (05:47 +0000)]

am b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev automerge: 48fd168
automerge: 73cce93

* commit '73cce93c07e871ad0fddf8a60a12e07660687d66':
Add configuration indicating whether TTY over VoLTE is supported.

commit | commitdiff | tree

Amit Mahajan [Sun, 28 Dec 2014 05:45:47 +0000 (05:45 +0000)]

am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev automerge: 4f68c0c
automerge: 4b2cbae

* commit '4b2cbae9cfd941633eadf9b667b3e3e0372c1ad2':
IMS: add the api to get IMS registration information.

commit | commitdiff | tree

John Spurlock [Sun, 28 Dec 2014 05:42:43 +0000 (05:42 +0000)]

am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev
automerge: db41690

* commit 'db416907b831010cc2854292aa7de85fd8857a77':
Audio Policy: Clear calling identity for all paths setting ringer mode.

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:41:16 +0000 (05:41 +0000)]

am 45c6ae56: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: bedfb2f -s ours

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

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:39:56 +0000 (05:39 +0000)]

am 4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: 378939f -s ours

* commit '378939f0580c615e21a5c9b17565b2822f326559':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:38:49 +0000 (05:38 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: c5d0323 -s ours

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

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:37:29 +0000 (05:37 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: b0e2d4c -s ours

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

commit | commitdiff | tree

Robin Lee [Sun, 28 Dec 2014 05:36:20 +0000 (05:36 +0000)]

am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev
automerge: c9db16c

* commit 'c9db16c59164d865b92e4527fb479fb892c5d4bb':
Revert "DevicePolicy: Don't warn about managed profile CAs"

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:35:06 +0000 (05:35 +0000)]

am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: cecabf4 -s ours

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

commit | commitdiff | tree

Baligh Uddin [Sun, 28 Dec 2014 05:33:41 +0000 (05:33 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: f17490f -s ours

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

commit | commitdiff | tree

Pavel Zhamaitsiak [Sun, 28 Dec 2014 05:32:24 +0000 (05:32 +0000)]

am b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev
automerge: 48fd168

* commit '48fd1688a27519b14959b1c181f1fa8178836997':
Add configuration indicating whether TTY over VoLTE is supported.

commit | commitdiff | tree

Amit Mahajan [Sun, 28 Dec 2014 05:29:52 +0000 (05:29 +0000)]

am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev
automerge: 4f68c0c

* commit '4f68c0c1d8811d610021d97839af303c2752eff2':
IMS: add the api to get IMS registration information.

commit | commitdiff | tree

Jinsuk Kim [Fri, 26 Dec 2014 20:37:55 +0000 (20:37 +0000)]

am 266f2b04: am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev
automerge: 0abbba9

* commit '0abbba9f426c5dcbd0ffd1be6b0f3ba5b7f129c4':
CEC: Let the caller check CEC device type

commit | commitdiff | tree

Robert Greenwalt [Fri, 26 Dec 2014 20:36:43 +0000 (20:36 +0000)]

am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev
automerge: ce524dc

* commit 'ce524dc6836f57e859fd2a9f28dffe37cfa3a6ae':
Fix timing between bcast and net setup.

commit | commitdiff | tree

John Spurlock [Fri, 26 Dec 2014 20:35:08 +0000 (20:35 +0000)]

am de9af5cd: am 17ca1aaf: Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev
automerge: edad58b

* commit 'edad58bc61fd4b54b6581f32f063321fcbd58cac':
Zen: Fix selection logic for "Indefinitely".

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 26 Dec 2014 20:33:40 +0000 (20:33 +0000)]

am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev
automerge: 6fa5d8d

* commit '6fa5d8dab0314e095af07f8e58c76a3af3de0c15':
AudioRecord: filter attributes

commit | commitdiff | tree

Jinsuk Kim [Fri, 26 Dec 2014 20:30:42 +0000 (20:30 +0000)]

am 266f2b04: am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev

* commit '266f2b047ebfb80a7fa72da302988fba4c902f43':
CEC: Let the caller check CEC device type

commit | commitdiff | tree

Robert Greenwalt [Fri, 26 Dec 2014 20:30:32 +0000 (20:30 +0000)]

am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev

* commit '33868dab9af09d61634f1f7ab3a8c704aacd0de0':
Fix timing between bcast and net setup.

commit | commitdiff | tree

John Spurlock [Fri, 26 Dec 2014 20:30:21 +0000 (20:30 +0000)]

am de9af5cd: am 17ca1aaf: Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev

* commit 'de9af5cdc0a8ce55657e82fa2a71faa9d6321cb1':
Zen: Fix selection logic for "Indefinitely".

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 26 Dec 2014 20:30:04 +0000 (20:30 +0000)]

am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev

* commit '98ba8409876087f32114d889435b7f1bd7a73ffb':
AudioRecord: filter attributes

commit | commitdiff | tree

Elliott Hughes [Fri, 26 Dec 2014 19:01:39 +0000 (19:01 +0000)]

am f9f41951: am ee435b16: Merge "telephony: Update comments for preferred network mode"
automerge: 38cba11

* commit '38cba11ba98831b0d6a005b7929d49f52259c564':
telephony: Update comments for preferred network mode

commit | commitdiff | tree

Elliott Hughes [Fri, 26 Dec 2014 18:59:22 +0000 (18:59 +0000)]

am f9f41951: am ee435b16: Merge "telephony: Update comments for preferred network mode"

* commit 'f9f41951701f5e47b454b7c3f4e7d4654a9c4a3e':
telephony: Update comments for preferred network mode

commit | commitdiff | tree

Elliott Hughes [Fri, 26 Dec 2014 18:53:55 +0000 (18:53 +0000)]

am ee435b16: Merge "telephony: Update comments for preferred network mode"

* commit 'ee435b16d89ee9cb65eead9ac7507693342c15b3':
telephony: Update comments for preferred network mode