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

Jakub Pawlowski [Fri, 9 Jun 2017 00:15:50 +0000 (00:15 +0000)]

Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev am: 556b10a4e6 am: 232108bafb
am: b203d8cad2

Change-Id: I476f2c2f86c841a0d42242b90c11a0e0fabd7e2f

commit | commitdiff | tree

Jakub Pawlowski [Fri, 9 Jun 2017 00:09:19 +0000 (00:09 +0000)]

Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev am: 556b10a4e6
am: 232108bafb

Change-Id: I859c30a21d87dac7b58b483a4469e9627e14cc55

commit | commitdiff | tree

Matthew Ng [Fri, 9 Jun 2017 00:01:57 +0000 (00:01 +0000)]

Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e620153" into oc-dev-plus-aosp am: ccf45069c0
am: 14e2bc32ed

Change-Id: If7de8c444e9af62e5c038fc9caf9e824f276b8e4

commit | commitdiff | tree

Jakub Pawlowski [Fri, 9 Jun 2017 00:01:44 +0000 (00:01 +0000)]

Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
am: 556b10a4e6

Change-Id: I92c46f849d80794d6c658b4ec0cfd071bf89a7bf

commit | commitdiff | tree

Matthew Ng [Thu, 8 Jun 2017 23:54:36 +0000 (23:54 +0000)]

Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e620153 am: 71e5f8f64d
am: 7f40766c25

Change-Id: I584a49cf8724ca6946cc7a8db24d9a75eac5e660

commit | commitdiff | tree

Matthew Ng [Thu, 8 Jun 2017 23:52:51 +0000 (23:52 +0000)]

Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e620153" into oc-dev-plus-aosp
am: ccf45069c0

Change-Id: Ib2ae2bfeb84e999696a04ea2ffdee93872564edf

commit | commitdiff | tree

Jakub Pawlowski [Thu, 8 Jun 2017 23:51:21 +0000 (23:51 +0000)]

Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev

commit | commitdiff | tree

Matthew Ng [Thu, 8 Jun 2017 23:48:34 +0000 (23:48 +0000)]

Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e620153
am: 71e5f8f64d

Change-Id: I5cc1c3d12ae1475d81bf6cb6ae6fff529a30839d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 23:44:38 +0000 (23:44 +0000)]

Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e620153" into oc-dev-plus-aosp

commit | commitdiff | tree

Matthew Ng [Thu, 8 Jun 2017 23:43:49 +0000 (23:43 +0000)]

Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am: 008e620153

Change-Id: If6a7101ba7055e23562b87195f35f1e068048389

commit | commitdiff | tree

Matthew Ng [Thu, 8 Jun 2017 23:40:43 +0000 (23:40 +0000)]

Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e620153 am: afa235e444" into oc-dr1-dev-plus-aosp
am: 338e84793b

Change-Id: I3c2fd41ff8736b9527b6f3c31f0abc68705c5c20

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:38:08 +0000 (23:38 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b -s ours am: 71713e846c -s ours
am: 333a0747a1 -s ours

Change-Id: Ic7d6636562d0c450ed1548415b5ba523636291f6

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 23:34:27 +0000 (23:34 +0000)]

Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e620153 am: afa235e444" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Matthew Ng [Thu, 8 Jun 2017 23:33:39 +0000 (23:33 +0000)]

Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e620153
am: afa235e444

Change-Id: I7644257bc94951f9e918aae009431a8ad0cf0de4

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:32:26 +0000 (23:32 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b -s ours am: 4ec78fa17b -s ours" into oc-dr1-dev-plus-aosp
am: 49bd4748e3 -s ours

Change-Id: I274b4748a05360acd38c91befa705f9182c2fa40

commit | commitdiff | tree

Matthew Ng [Thu, 8 Jun 2017 23:31:02 +0000 (23:31 +0000)]

Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am: 008e620153

Change-Id: If1947aac627b92213202b22b721a397492173508

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:30:52 +0000 (23:30 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b -s ours
am: 71713e846c -s ours

Change-Id: I602a57140ca17d6a15cac0a39b5565e8657fc12f

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:30:07 +0000 (23:30 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636 -s ours am: 95657195ca -s ours" into oc-dr1-dev-plus-aosp
am: 748604c1ab -s ours

Change-Id: I775df6af91f1155c2a43358d50a1e92cbc1dd580

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:27:28 +0000 (23:27 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636 -s ours am: 3183fb75ac -s ours
am: 355ce9eb98 -s ours

Change-Id: I2493d1958fae0d464e736cf89fd1307a8a68ea49

commit | commitdiff | tree

Matthew Ng [Thu, 8 Jun 2017 23:25:36 +0000 (23:25 +0000)]

Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am: 008e620153

Change-Id: Id626a44a564ae0811338bb04c3c6efb698d07b37

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 23:25:20 +0000 (23:25 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b -s ours am: 4ec78fa17b -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:24:17 +0000 (23:24 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b -s ours
am: 4ec78fa17b -s ours

Change-Id: I859e5d2bbdc071565c6be82e8353e9bc18141c86

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 23:23:51 +0000 (23:23 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636 -s ours am: 95657195ca -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:23:02 +0000 (23:23 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: dd5886bc5b -s ours

Change-Id: I99f7800bccdd03503185c593f86c1daab328c7f5

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:21:33 +0000 (23:21 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636 -s ours
am: 3183fb75ac -s ours

Change-Id: Ia39368e2fdcaeabe757a02b740ea9a1dab6eb653

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:21:30 +0000 (23:21 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636 -s ours
am: 95657195ca -s ours

Change-Id: I46e87727da55349410a0ef208a4dac8ae41c2aa5

commit | commitdiff | tree

TreeHugger Robot [Thu, 8 Jun 2017 23:21:05 +0000 (23:21 +0000)]

Merge "Fixes the animation and state when docking a task by drag" into oc-dev

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:15:04 +0000 (23:15 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: dd5886bc5b -s ours

Change-Id: I62a7f882d68c02075e41e2c9da475a75af113b0f

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:14:52 +0000 (23:14 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 67a947b636 -s ours

Change-Id: I87e77b18f173d20154743daf5e735bf72bfc685f

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:12:30 +0000 (23:12 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 67a947b636 -s ours

Change-Id: If19e88be06d1d63955c7213c95dff59056a86c88

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:04:51 +0000 (23:04 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:04:00 +0000 (23:04 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d -s ours am: 5679e1cc6e -s ours" into oc-dr1-dev-plus-aosp
am: ac1e953b78 -s ours

Change-Id: I6e3f190769ace99cea5e66cb3902f17fdc073324

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 23:03:52 +0000 (23:03 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 22:56:12 +0000 (22:56 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d -s ours am: 041f0dce8a -s ours
am: 7891c6111a -s ours

Change-Id: I21ed7b4ac16b487e3b5da87c48fdea526124be94

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 22:53:16 +0000 (22:53 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d -s ours am: 5679e1cc6e -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 22:52:21 +0000 (22:52 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d -s ours
am: 5679e1cc6e -s ours

Change-Id: I62d5eaf20549840c1a4adab9f247b292e3505159

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 22:49:33 +0000 (22:49 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d -s ours
am: 041f0dce8a -s ours

Change-Id: Ic242af69e818aefb95a3b889294fb45240432a33

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 22:45:15 +0000 (22:45 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 75b5199e9d -s ours

Change-Id: I3393f85819b8ed0fec35cfa0cbea0899141d73dc

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 22:41:45 +0000 (22:41 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 75b5199e9d -s ours

Change-Id: Ic7b1e9095cf413bd0401bd8d3cdfc469dd915988

commit | commitdiff | tree

Bill Yi [Thu, 8 Jun 2017 22:34:26 +0000 (22:34 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 8 Jun 2017 22:32:16 +0000 (22:32 +0000)]

Merge "Return exit code 0 when the command run successfully"

commit | commitdiff | tree

Mathieu Chartier [Thu, 8 Jun 2017 22:11:35 +0000 (22:11 +0000)]

Merge "Add system property for hot startup method threshold" am: a370159592 am: 187b15bbd5 am: abb7782a4e
am: e4f07b2cb6

Change-Id: I67985c42d208a62ecc504f7701c12c7200655aa9

commit | commitdiff | tree

Mathieu Chartier [Thu, 8 Jun 2017 22:06:08 +0000 (22:06 +0000)]

Merge "Add system property for hot startup method threshold" am: a370159592 am: 187b15bbd5
am: abb7782a4e

Change-Id: I0122af5a47614972dd5ba696f8a22bcae2625a1c

commit | commitdiff | tree

Mathieu Chartier [Thu, 8 Jun 2017 22:00:09 +0000 (22:00 +0000)]

Merge "Add system property for hot startup method threshold" am: a370159592
am: 187b15bbd5

Change-Id: Id56adbe39e8a81ef12c4b9d8fdcf65c94a316d6f

commit | commitdiff | tree

Mathieu Chartier [Thu, 8 Jun 2017 21:54:22 +0000 (21:54 +0000)]

Merge "Add system property for hot startup method threshold"
am: a370159592

Change-Id: I271cf74364b7b9c2d16282ef6a9ab24b6d243e1e

commit | commitdiff | tree

Mathieu Chartier [Thu, 8 Jun 2017 21:44:06 +0000 (21:44 +0000)]

Merge "Add system property for hot startup method threshold"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 21:43:22 +0000 (21:43 +0000)]

Merge "Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100" into oc-dev-plus-aosp am: c2bc1f2790 am: e999fa69cf"

commit | commitdiff | tree

Adam Lesinski [Thu, 8 Jun 2017 21:42:27 +0000 (21:42 +0000)]

Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100" into oc-dev-plus-aosp am: c2bc1f2790
am: e999fa69cf

Change-Id: I61092a93b865d3a451845cd0b2528175ba0949b3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 21:41:57 +0000 (21:41 +0000)]

Merge "Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f209f am: c0fed83b84 am: 3b852973e3 am: fcc30a6db3"

commit | commitdiff | tree

Jakub Pawlowski [Thu, 8 Jun 2017 21:41:06 +0000 (21:41 +0000)]

Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f209f am: c0fed83b84 am: 3b852973e3
am: fcc30a6db3

Change-Id: I8ce718a0322408565530840d5131998f03535159

commit | commitdiff | tree

Jordan Liu [Thu, 8 Jun 2017 21:40:12 +0000 (21:40 +0000)]

Merge "Add IApnSourceService.aidl"

commit | commitdiff | tree

Adam Lesinski [Thu, 8 Jun 2017 21:35:03 +0000 (21:35 +0000)]

Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100 am: adca091fcd
am: 21983b0293

Change-Id: I3403721ca4aabb53bb2eed3b8e6dfc3093fb3b5c

commit | commitdiff | tree

Adam Lesinski [Thu, 8 Jun 2017 21:33:26 +0000 (21:33 +0000)]

Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100" into oc-dev-plus-aosp
am: c2bc1f2790

Change-Id: I8cc5adb9382909d5f149dfdb5ce760e1e9a29d96

commit | commitdiff | tree

Tyler Gunn [Thu, 8 Jun 2017 21:31:43 +0000 (21:31 +0000)]

Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am: 980582e555 am: da88ca6f10
am: cc26dbbb46

Change-Id: Id2f7b34bc376ad82cd134b2d400341a8e8500b53

commit | commitdiff | tree

Jakub Pawlowski [Thu, 8 Jun 2017 21:30:57 +0000 (21:30 +0000)]

Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f209f am: c0fed83b84
am: 3b852973e3

Change-Id: I1c037d2461bb5c82ff405a507c9fce60b5902368

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 21:25:47 +0000 (21:25 +0000)]

Merge "Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am: 980582e555 am: f512d86f5b am: 37300eb77e"

commit | commitdiff | tree

Adam Lesinski [Thu, 8 Jun 2017 21:25:24 +0000 (21:25 +0000)]

Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100
am: adca091fcd

Change-Id: I49afd37a236925b59ac84fe4b620e2a93baf0686

commit | commitdiff | tree

Tyler Gunn [Thu, 8 Jun 2017 21:24:20 +0000 (21:24 +0000)]

Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am: 980582e555 am: f512d86f5b
am: 37300eb77e

Change-Id: Ieedc8cdcb7b68d7daeae1ef09f0ba0df134875e5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 21:23:46 +0000 (21:23 +0000)]

Merge "Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5 am: 87df9ee8b7 am: 0f9be35ae4"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 21:23:30 +0000 (21:23 +0000)]

Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100" into oc-dev-plus-aosp

commit | commitdiff | tree

Daichi Hirono [Thu, 8 Jun 2017 21:22:56 +0000 (21:22 +0000)]

Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5 am: 87df9ee8b7
am: 0f9be35ae4

Change-Id: Ifeb946b66bef8807d03f2d5948ee8442d79eeb43

commit | commitdiff | tree

Adam Lesinski [Thu, 8 Jun 2017 21:22:21 +0000 (21:22 +0000)]

Merge "Revert "always adjust per-user application info"" into oc-dev
am: 887544e100

Change-Id: I944c449954876353c7e597fca19ac5fe00e62906

commit | commitdiff | tree

TreeHugger Robot [Thu, 8 Jun 2017 21:22:10 +0000 (21:22 +0000)]

Merge "Fix SynchronizeOnNonFinalField warning in FragmentManager."

commit | commitdiff | tree

Jakub Pawlowski [Thu, 8 Jun 2017 21:20:27 +0000 (21:20 +0000)]

Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f209f
am: c0fed83b84

Change-Id: I871bc30dcd7aeb5c4a6f6c15d84b43dee84994f2

commit | commitdiff | tree

Adam Lesinski [Thu, 8 Jun 2017 21:20:03 +0000 (21:20 +0000)]

Merge "Revert "always adjust per-user application info"" into oc-dev
am: 887544e100

Change-Id: I440be882264d8687d7b5e3de036e54bf91386d6d

commit | commitdiff | tree

Mady Mellor [Thu, 8 Jun 2017 21:15:47 +0000 (21:15 +0000)]

Merge "Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11 am: 440137be48" into oc-dr1-dev-plus-aosp
am: b1ae22139a

Change-Id: I2665bccc9b118938f2cb1ba9ae36b2f4909c3d06

commit | commitdiff | tree

Adam Lesinski [Thu, 8 Jun 2017 21:14:02 +0000 (21:14 +0000)]

Merge "Revert "always adjust per-user application info"" into oc-dev

commit | commitdiff | tree

Jakub Pawlowski [Thu, 8 Jun 2017 21:12:26 +0000 (21:12 +0000)]

Merge "Bluetooth: fix connectGatt overload invocations"
am: 404e9f209f

Change-Id: I01699795f733fbf46af10ba25afd8cb3feecc9ea

commit | commitdiff | tree

Adam Lesinski [Thu, 8 Jun 2017 20:16:39 +0000 (20:16 +0000)]

Revert "always adjust per-user application info"

This reverts commit e0046cecb079ec4d063444cee64795a6b734e6e7.

Reason for revert: Regresses UI theme

Bug: 62445682
Bug: 36561125
Change-Id: I9b60bd8e4eb89129368d38e83c0036ab459a524e

commit | commitdiff | tree

Daichi Hirono [Thu, 8 Jun 2017 21:05:47 +0000 (21:05 +0000)]

Merge "Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5 am: 44442c4c99" into oc-dr1-dev-plus-aosp
am: ec999df45c

Change-Id: Idb8caf12d246e15f9d04135fcfb24be2dce58ef4

commit | commitdiff | tree

Winson Chung [Thu, 8 Jun 2017 21:03:07 +0000 (21:03 +0000)]

Merge "Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018 am: 9fd8e49fe0" into oc-dr1-dev-plus-aosp
am: b13b4a385a

Change-Id: I263f7870b59e94ff807d09943bb4a2ee65cfd152

commit | commitdiff | tree

Jakub Pawlowski [Wed, 7 Jun 2017 20:45:33 +0000 (13:45 -0700)]

Bluetooth: fix connectGatt overload invocations

Merged-In: I726252e85e78bff2c9585332d2748a0d92a9f6d3
Test: sl4a GattOverBrEdrTest
Bug: 62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99

commit | commitdiff | tree

Mady Mellor [Thu, 8 Jun 2017 21:00:28 +0000 (21:00 +0000)]

Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11 am: b2b3628565
am: 16fe3c84f4

Change-Id: I30465efb9d3b8fce31351c75cfe34659b39ff6ac

commit | commitdiff | tree

Jakub Pawlowski [Thu, 8 Jun 2017 20:59:33 +0000 (20:59 +0000)]

Merge "Bluetooth: fix connectGatt overload invocations"

commit | commitdiff | tree

Jason Monk [Thu, 8 Jun 2017 20:57:58 +0000 (20:57 +0000)]

Merge "Merge "Move QS cell indicator back into mobile data tile" into oc-dev am: a5b457b3bf am: 0a993da2bf" into oc-dr1-dev-plus-aosp
am: c7d48044f1

Change-Id: I5f30449f0029eb23df4345ad0cd034b78ffbd007

commit | commitdiff | tree

Winson Chung [Thu, 8 Jun 2017 20:51:16 +0000 (20:51 +0000)]

Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018 am: b2a93b69a2
am: c259b94c63

Change-Id: I818e995f1a2aec43adaa4c6a9df832e6213f8523

commit | commitdiff | tree

Tyler Gunn [Thu, 8 Jun 2017 20:50:56 +0000 (20:50 +0000)]

Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am: 980582e555
am: da88ca6f10

Change-Id: Ie425e27ee5821f5117d9159b1b5180389f2faa1d

commit | commitdiff | tree

Jason Monk [Thu, 8 Jun 2017 20:48:08 +0000 (20:48 +0000)]

resolve merge conflicts of a5b457b3bf6f to oc-dr1-dev am: d7dab0f36f
am: c0eddd3657

Change-Id: I8f0a544e7464dc79e6b90ef3662a2f85cb0c8142

commit | commitdiff | tree

Tyler Gunn [Thu, 8 Jun 2017 20:41:57 +0000 (20:41 +0000)]

Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am: 980582e555
am: f512d86f5b

Change-Id: Ic863586ac031b340a30db6f408240f68b270ad76

commit | commitdiff | tree

Daichi Hirono [Thu, 8 Jun 2017 20:37:32 +0000 (20:37 +0000)]

Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5
am: 87df9ee8b7

Change-Id: I714abae0311042314d670a6ba8fc14548fea52ce

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 20:33:28 +0000 (20:33 +0000)]

Merge "Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11 am: 440137be48" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Tony Mak [Wed, 7 Jun 2017 16:34:59 +0000 (17:34 +0100)]

Return exit code 0 when the command run successfully

Fix: 62410589
Test: run the pm create-user command and check the exit code

Change-Id: I5bde1f886860cd8edb869ebaa8f6e5376882f03b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 20:32:21 +0000 (20:32 +0000)]

Merge "Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5 am: 44442c4c99" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Mady Mellor [Thu, 8 Jun 2017 20:32:22 +0000 (20:32 +0000)]

Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11
am: 440137be48

Change-Id: I8d6b0b9899119f7bbefc1e0048bbbe916fa9db28

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 20:31:48 +0000 (20:31 +0000)]

Merge "Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018 am: 9fd8e49fe0" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Daichi Hirono [Thu, 8 Jun 2017 20:31:17 +0000 (20:31 +0000)]

Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5
am: 44442c4c99

Change-Id: I8e78cbf8718a7e0665a367cd90333f6dcaf6de55

commit | commitdiff | tree

Winson Chung [Thu, 8 Jun 2017 20:29:21 +0000 (20:29 +0000)]

Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018
am: 9fd8e49fe0

Change-Id: Ia336b014df6e9a9445d17f9aa485d24b3f1ea921

commit | commitdiff | tree

Mady Mellor [Thu, 8 Jun 2017 20:28:26 +0000 (20:28 +0000)]

Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11
am: b2b3628565

Change-Id: I7ba78968e6e5b6d07b0e36b83631535ad2209270

commit | commitdiff | tree

Tyler Gunn [Thu, 8 Jun 2017 20:26:55 +0000 (20:26 +0000)]

Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am: 980582e555

Change-Id: Id41b469e278c194337da36a0b34d02efa99b8906

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 8 Jun 2017 20:25:37 +0000 (20:25 +0000)]

Merge "Merge "Move QS cell indicator back into mobile data tile" into oc-dev am: a5b457b3bf am: 0a993da2bf" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Thu, 8 Jun 2017 20:24:15 +0000 (20:24 +0000)]

Merge "Move QS cell indicator back into mobile data tile" into oc-dev am: a5b457b3bf
am: 0a993da2bf

Change-Id: Idbfd4664ae7b45990771ab13763ae587798f1679

commit | commitdiff | tree

Winson Chung [Thu, 8 Jun 2017 20:23:29 +0000 (20:23 +0000)]

Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018
am: b2a93b69a2

Change-Id: Ic50927eed7d9f2a0a1a8e4c70118e3fbe633e081

commit | commitdiff | tree

Daichi Hirono [Thu, 8 Jun 2017 20:19:56 +0000 (20:19 +0000)]

Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am: ebb6e998d5

Change-Id: I03e1b4ddb5315a2eae099bb85b692bf90744ba3d

commit | commitdiff | tree

Mady Mellor [Thu, 8 Jun 2017 20:16:45 +0000 (20:16 +0000)]

Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
am: f574869c11

Change-Id: I8b98780208ca4e89d249fc7ebd688b868b3fb9be

commit | commitdiff | tree

Tyler Gunn [Thu, 8 Jun 2017 20:15:58 +0000 (20:15 +0000)]

Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am: 980582e555

Change-Id: I50666f5d3c4e224221a07a170598a5ea25d5f5ef

commit | commitdiff | tree

Jason Monk [Thu, 8 Jun 2017 20:15:01 +0000 (20:15 +0000)]

resolve merge conflicts of a5b457b3bf6f to oc-dr1-dev
am: d7dab0f36f

Change-Id: Ie14a5e532c4d30ab8fb013cc4fd2a96ecd5def15

commit | commitdiff | tree

Winson Chung [Thu, 8 Jun 2017 20:10:36 +0000 (20:10 +0000)]

Merge "Fix crash when deleting task" into oc-dev
am: c6fa8ee018

Change-Id: I65e242e2f3de857c508c9a7c768ef504121acb25

commit | commitdiff | tree

Tyler Gunn [Thu, 8 Jun 2017 20:06:52 +0000 (20:06 +0000)]

Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev

commit | commitdiff | tree

Daichi Hirono [Thu, 8 Jun 2017 18:30:15 +0000 (18:30 +0000)]

Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am: ebb6e998d5

Change-Id: I8973b62b103f4f40275bc5681f54b5957385ecb1

commit | commitdiff | tree

TreeHugger Robot [Thu, 8 Jun 2017 18:25:24 +0000 (18:25 +0000)]

Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev