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

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:28:30 +0000 (21:28 +0000)]

Merge "Merge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage-aosp-master am: 2e8ba8dd5c" into oc-dev-plus-aosp am: c8f37d679e -s ours" into oc-dr1-dev-plus-aosp
am: f9fab570c7 -s ours

Change-Id: I6b9e423a0607d58dd39b90b309b562b31f4a906f

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:26:36 +0000 (21:26 +0000)]

Merge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b" into oc-dev-plus-aosp am: b8891f3313 -s ours" into oc-dr1-dev-plus-aosp
am: 04afa1818d -s ours

Change-Id: I133560455db120b1bb7c2d2efc7decdf6b0105bf

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:24:44 +0000 (21:24 +0000)]

Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b" into oc-dev-plus-aosp am: b8891f3313
am: cf031d4122 -s ours

Change-Id: Ic31d45f557c1503c6dd6b64c5e5cb28c778e8ac8

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:20:37 +0000 (21:20 +0000)]

Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b am: ee4a43f143 am: 9e3b27244b -s ours"

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:19:41 +0000 (21:19 +0000)]

Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b am: ee4a43f143
am: 9e3b27244b -s ours

Change-Id: I6e0dc124fabcae6d2d601e1109a8375ef2115756

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:18:46 +0000 (21:18 +0000)]

Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b am: ee4a43f143
am: 9e3b27244b -s ours

Change-Id: Ie0e8efe593d45e08878a77dbc20ba6c8ab9bb45c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:18:30 +0000 (21:18 +0000)]

Merge "Merge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage-aosp-master am: 2e8ba8dd5c" into oc-dev-plus-aosp am: c8f37d679e -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:18:08 +0000 (21:18 +0000)]

Merge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b" into oc-dev-plus-aosp am: b8891f3313 -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:17:16 +0000 (21:17 +0000)]

Merge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage-aosp-master am: 2e8ba8dd5c" into oc-dev-plus-aosp
am: c8f37d679e -s ours

Change-Id: I391beec51b9942ae42a923f71c3c031e72c6db12

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:16:59 +0000 (21:16 +0000)]

Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b" into oc-dev-plus-aosp
am: b8891f3313 -s ours

Change-Id: I42565b427b20b97d15717ae114c7f854c343804c

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:15:30 +0000 (21:15 +0000)]

Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b" into oc-dev-plus-aosp
am: b8891f3313

Change-Id: I720bd19e970176f7679c1f705a9d1168ce713577

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:13:51 +0000 (21:13 +0000)]

Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b
am: ee4a43f143

Change-Id: Ibba17cefcd97e8c4f81857eb0d02e5240dba015a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:10:08 +0000 (21:10 +0000)]

Merge "Merge "Merge "Fix RTL mobile signal drawing out of bounds in QS Edit" into oc-dr1-dev am: 1b59a9ccb2" into oc-dr1-dev-plus-aosp am: 5bcea49e71"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:09:50 +0000 (21:09 +0000)]

Merge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage-aosp-master am: 2e8ba8dd5c" into oc-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:09:27 +0000 (21:09 +0000)]

Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b" into oc-dev-plus-aosp

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:09:05 +0000 (21:09 +0000)]

Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage-aosp-master
am: 2e8ba8dd5c

Change-Id: I8b8b8cfb2f8671726d1661e7e9b634f2ac374930

commit | commitdiff | tree

Evan Laird [Thu, 6 Jul 2017 21:08:41 +0000 (21:08 +0000)]

Merge "Merge "Fix RTL mobile signal drawing out of bounds in QS Edit" into oc-dr1-dev am: 1b59a9ccb2" into oc-dr1-dev-plus-aosp
am: 5bcea49e71

Change-Id: I821bebda8bccbb62d6969c710aa0d1fe998bc419

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:08:21 +0000 (21:08 +0000)]

Merge "Enable priority boost for non-Jack builds." am: 847c70da66
am: 24a1598b5b

Change-Id: If65490df9f24444efa1040cfad1b2a1afe803afa

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:08:12 +0000 (21:08 +0000)]

Merge "Merge "Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5" into oc-dr1-dev-plus-aosp am: 79d658b314"

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:07:27 +0000 (21:07 +0000)]

Merge "Enable priority boost for non-Jack builds." am: 847c70da66
am: 24a1598b5b

Change-Id: I8303e4193e4eccafa83253429b24bf9cc49234dc

commit | commitdiff | tree

Karthik Ravi Shankar [Thu, 6 Jul 2017 21:07:05 +0000 (21:07 +0000)]

Merge "Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5" into oc-dr1-dev-plus-aosp
am: 79d658b314

Change-Id: I85452b504d37299a6f9e269720e62dc62c6a9653

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:06:45 +0000 (21:06 +0000)]

Merge "Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5 am: b459013081"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:06:11 +0000 (21:06 +0000)]

Merge "Merge "Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5" into oc-dr1-dev-plus-aosp am: 79d658b314"

commit | commitdiff | tree

Karthik Ravi Shankar [Thu, 6 Jul 2017 21:05:34 +0000 (21:05 +0000)]

Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5
am: b459013081

Change-Id: Ia1f769090c36578c61e9d7c9aac088558757dff1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:05:04 +0000 (21:05 +0000)]

Merge "Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549" into oc-dev-plus-aosp am: 04df4c07fe" into oc-dr1-dev-plus-aosp am: f33d5d3e0f"

commit | commitdiff | tree

Karthik Ravi Shankar [Thu, 6 Jul 2017 21:04:54 +0000 (21:04 +0000)]

Merge "Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5" into oc-dr1-dev-plus-aosp
am: 79d658b314

Change-Id: I1474f7696c79a17801eb5941c0c91ad356571bca

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:04:29 +0000 (21:04 +0000)]

Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage-aosp-master

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:04:09 +0000 (21:04 +0000)]

Merge "Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5 am: b459013081"

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 21:03:47 +0000 (21:03 +0000)]

Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549" into oc-dev-plus-aosp am: 04df4c07fe" into oc-dr1-dev-plus-aosp
am: f33d5d3e0f

Change-Id: Ibba26251ac9d8ea743022d5383dee27721b40901

commit | commitdiff | tree

Karthik Ravi Shankar [Thu, 6 Jul 2017 21:03:10 +0000 (21:03 +0000)]

Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5
am: b459013081

Change-Id: I31d05682f1a47f9b4a810750fb2a3d9023297ac2

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:03:01 +0000 (21:03 +0000)]

Merge "Enable priority boost for non-Jack builds."
am: 847c70da66

Change-Id: Ie3e16e7452404b5d83d87c5f4d86abb94f7e1c6b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:02:50 +0000 (21:02 +0000)]

Merge "Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549" into oc-dev-plus-aosp am: 04df4c07fe" into oc-dr1-dev-plus-aosp am: f33d5d3e0f"

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:02:04 +0000 (21:02 +0000)]

Merge "Enable priority boost for non-Jack builds."
am: 847c70da66

Change-Id: I2172acbf465cf19c3af7388309367b77750c4ac0

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 21:01:33 +0000 (21:01 +0000)]

Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549" into oc-dev-plus-aosp am: 04df4c07fe" into oc-dr1-dev-plus-aosp
am: f33d5d3e0f

Change-Id: I9aa9608f1dc706a2281f9a1381722d1fc635b4ae

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:01:05 +0000 (21:01 +0000)]

Merge "Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549" into oc-dev-plus-aosp am: 04df4c07fe" into oc-dr1-dev-plus-aosp am: 22cfa276a0"

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 20:59:53 +0000 (20:59 +0000)]

Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549" into oc-dev-plus-aosp am: 04df4c07fe" into oc-dr1-dev-plus-aosp
am: 22cfa276a0

Change-Id: Ica1caebe6adf73ed5b299e3cbcef53c574f1c41e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:59:20 +0000 (20:59 +0000)]

Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549 am: 429b739ff5" into oc-dr1-dev-plus-aosp am: 60d9fd87f7"

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 20:57:57 +0000 (20:57 +0000)]

Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549 am: 429b739ff5" into oc-dr1-dev-plus-aosp
am: 60d9fd87f7

Change-Id: I8892c182ae72bb1b5928eaece2a7cf15a7c33f74

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:57:11 +0000 (20:57 +0000)]

Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549 am: 429b739ff5 am: 4f8c2aa285"

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 20:56:08 +0000 (20:56 +0000)]

Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549 am: 429b739ff5
am: 4f8c2aa285

Change-Id: I3ecd14630da4a3668b9c30d7e1e84866319ea3ee

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:55:35 +0000 (20:55 +0000)]

Merge "Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d88" into oc-dr1-dev-plus-aosp am: 5e69a2a8c4"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:55:26 +0000 (20:55 +0000)]

Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549 am: 429b739ff5 am: 4f8c2aa285"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 20:54:30 +0000 (20:54 +0000)]

Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d88" into oc-dr1-dev-plus-aosp
am: 5e69a2a8c4

Change-Id: I32d0afb5c61967e87f945a652dc7f04f1e9c94a0

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:53:59 +0000 (20:53 +0000)]

Merge "Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: bc0afda3d2" into oc-dr1-dev-plus-aosp am: 724e5363c9"

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 20:53:58 +0000 (20:53 +0000)]

Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549 am: 429b739ff5
am: 4f8c2aa285

Change-Id: Iba5db076ffbc4de9a6010c67208ea4a70a31dcd0

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:53:23 +0000 (20:53 +0000)]

Merge "Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d88" into oc-dr1-dev-plus-aosp am: 5e69a2a8c4"

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:52:51 +0000 (20:52 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: bc0afda3d2" into oc-dr1-dev-plus-aosp
am: 724e5363c9

Change-Id: Ib589fdc5b7dc1e1bcc04549768dc281a30513f2e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:52:23 +0000 (20:52 +0000)]

Merge "Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d88" into oc-dr1-dev-plus-aosp am: 738c00d12f"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 20:52:14 +0000 (20:52 +0000)]

Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d88" into oc-dr1-dev-plus-aosp
am: 5e69a2a8c4

Change-Id: I64fcfbe09ab4edd037df96162cf6d85d02b8ef90

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:51:48 +0000 (20:51 +0000)]

Merge "Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: bc0afda3d2" into oc-dr1-dev-plus-aosp am: 724e5363c9"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 20:51:15 +0000 (20:51 +0000)]

Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d88" into oc-dr1-dev-plus-aosp
am: 738c00d12f

Change-Id: Ibc24435c600c7e8b384707c622e13ca6376d8df5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:50:48 +0000 (20:50 +0000)]

Merge "Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dev-plus-aosp am: 9cd4a89735" into oc-dr1-dev-plus-aosp am: f2a1546c09"

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:50:03 +0000 (20:50 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: bc0afda3d2" into oc-dr1-dev-plus-aosp
am: 724e5363c9

Change-Id: Ideef3898414cc6d32fd8ee0796e21f8a6602c7c9

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:49:42 +0000 (20:49 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dev-plus-aosp am: 9cd4a89735" into oc-dr1-dev-plus-aosp
am: f2a1546c09

Change-Id: Ic85d1894873ae6b54fa9a28774434c476f22e5d5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:49:39 +0000 (20:49 +0000)]

Merge "Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d88" into oc-dr1-dev-plus-aosp am: 738c00d12f"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:49:07 +0000 (20:49 +0000)]

Merge "Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: 10dedbbc8a" into oc-dr1-dev-plus-aosp am: 0106e790b5"

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 20:48:31 +0000 (20:48 +0000)]

Merge "Enable priority boost for non-Jack builds."

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 20:48:27 +0000 (20:48 +0000)]

Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d88" into oc-dr1-dev-plus-aosp
am: 738c00d12f

Change-Id: I79f37739d3b6ad20d03a87bc54eb015e52234982

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:47:55 +0000 (20:47 +0000)]

Merge "Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dev-plus-aosp am: 9cd4a89735" into oc-dr1-dev-plus-aosp am: f2a1546c09"

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:47:37 +0000 (20:47 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: 10dedbbc8a" into oc-dr1-dev-plus-aosp
am: 0106e790b5

Change-Id: I6b088f2dacce5d7e95c7b7771c9ec4c3b5474c66

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:46:59 +0000 (20:46 +0000)]

Merge "Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: bc0afda3d2" into oc-dr1-dev-plus-aosp am: 69400c1916"

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 20:46:31 +0000 (20:46 +0000)]

Merge "Add adamlesinski@google.com as owner of AAPT2"

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:46:20 +0000 (20:46 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dev-plus-aosp am: 9cd4a89735" into oc-dr1-dev-plus-aosp
am: f2a1546c09

Change-Id: I3f76e2952a6effc2177eea0341ed6e4d8daa7624

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:45:27 +0000 (20:45 +0000)]

Merge "Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: 10dedbbc8a" into oc-dr1-dev-plus-aosp am: 0106e790b5"

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:45:05 +0000 (20:45 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: bc0afda3d2" into oc-dr1-dev-plus-aosp
am: 69400c1916

Change-Id: Ibfa09b0ee809eacc327d20b34d501f915b1a1bbc

commit | commitdiff | tree

Abodunrinwa Toki [Thu, 6 Jul 2017 20:44:58 +0000 (20:44 +0000)]

Merge "Make ActionMode.isUiFocusable a TestApi"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:44:28 +0000 (20:44 +0000)]

Merge "Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: 10dedbbc8a" into oc-dr1-dev-plus-aosp am: 21a24ffba8"

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:44:09 +0000 (20:44 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: 10dedbbc8a" into oc-dr1-dev-plus-aosp
am: 0106e790b5

Change-Id: Idb6f5c1784c2da96d1758dc7153ff943d9799cfa

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:43:18 +0000 (20:43 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: 10dedbbc8a" into oc-dr1-dev-plus-aosp
am: 21a24ffba8

Change-Id: I12ee6ea0dc58ef6ea22e4a4ed456a053ac9f40f9

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:42:35 +0000 (20:42 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: bc0afda3d2" into oc-dr1-dev-plus-aosp
am: 69400c1916

Change-Id: Ia01f9a117e922852ec474557fe2bf8954e36553d

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:41:17 +0000 (20:41 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: 10dedbbc8a" into oc-dr1-dev-plus-aosp
am: 21a24ffba8

Change-Id: I5a2c5109b69ef262a2d42c6c420645f36891256f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:40:29 +0000 (20:40 +0000)]

Merge "Merge "Fix RTL mobile signal drawing out of bounds in QS Edit" into oc-dr1-dev am: 1b59a9ccb2" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:39:35 +0000 (20:39 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dev-plus-aosp am: 9cd4a89735" into oc-dr1-dev-plus-aosp
am: 53d30669bb

Change-Id: I3c9d23d96d6efb9ee3164217a7cd3fa8bad3c6f2

commit | commitdiff | tree

Evan Laird [Thu, 6 Jul 2017 20:39:33 +0000 (20:39 +0000)]

Merge "Fix RTL mobile signal drawing out of bounds in QS Edit" into oc-dr1-dev
am: 1b59a9ccb2

Change-Id: I9ec17abd8a4ae29f437a8611c0e8f3059d1b0e73

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:39:13 +0000 (20:39 +0000)]

Merge "Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Karthik Ravi Shankar [Thu, 6 Jul 2017 20:38:22 +0000 (20:38 +0000)]

Merge "Fix the VR virtual display height" into oc-dr1-dev
am: a79a23dba5

Change-Id: I9c16c20b98220699cd422a4aeb0e6f088a0376f7

commit | commitdiff | tree

Karthik Ravi Shankar [Thu, 6 Jul 2017 20:38:18 +0000 (20:38 +0000)]

Merge "Fix the VR virtual display height" into oc-dr1-dev
am: a79a23dba5

Change-Id: Ie83926b9cca629fb2d3e2ba2bbad9c1a13629db6

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 20:38:08 +0000 (20:38 +0000)]

Merge "Merge "AOD: Fix flicker when unlocking with fingerprint" into oc-dr1-dev am: 88265d29bd" into oc-dr1-dev-plus-aosp
am: db0b661d5e

Change-Id: I02b1314ec88a8b62b22619229d8ef0ac92020d95

commit | commitdiff | tree

Andrew Solovay [Thu, 6 Jul 2017 20:36:37 +0000 (20:36 +0000)]

Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928 am: ee10807328
am: c2c0997b40

Change-Id: I34bf16c3d56fbb0424fbbb18435855785bb58d24

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:35:29 +0000 (20:35 +0000)]

Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549" into oc-dev-plus-aosp am: 04df4c07fe" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:34:58 +0000 (20:34 +0000)]

Merge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549" into oc-dev-plus-aosp am: 04df4c07fe" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 20:34:20 +0000 (20:34 +0000)]

Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549" into oc-dev-plus-aosp
am: 04df4c07fe

Change-Id: I36613d1582663f229a8025cf7cfb2c9dad1f565f

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 20:33:57 +0000 (20:33 +0000)]

Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549" into oc-dev-plus-aosp
am: 04df4c07fe

Change-Id: I2266994567f5533124566cb0ea41d792bb8e2e72

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:33:46 +0000 (20:33 +0000)]

Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549 am: 429b739ff5" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:33:19 +0000 (20:33 +0000)]

Merge "Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp am: 0efb0644fc"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:33:07 +0000 (20:33 +0000)]

Merge "Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp am: 0efb0644fc"

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 20:32:47 +0000 (20:32 +0000)]

Merge "Fix RTL mobile signal drawing out of bounds in QS Edit" into oc-dr1-dev

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 20:32:39 +0000 (20:32 +0000)]

Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549
am: 429b739ff5

Change-Id: I446eba3137fc7077d7512d6e8b27a2f05a0bb281

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 20:31:36 +0000 (20:31 +0000)]

Merge "Fix the VR virtual display height" into oc-dr1-dev

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:31:23 +0000 (20:31 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp
am: 0efb0644fc

Change-Id: I9d46f6356833f384470fe4f02022e67c3937409d

commit | commitdiff | tree

Yifan Hong [Thu, 6 Jul 2017 20:31:21 +0000 (20:31 +0000)]

Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c am: 90a5fd0549
am: 429b739ff5

Change-Id: I6acb5102e5052ce4182205a3ed16eee0006dbd49

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:30:47 +0000 (20:30 +0000)]

Merge "Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp am: 0dda017310"

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:30:46 +0000 (20:30 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp
am: 0efb0644fc

Change-Id: I1dd611f253b82a2de1a2f9ff6cac7565a8a535fa

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:29:59 +0000 (20:29 +0000)]

Merge "Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp am: 0dda017310"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:29:32 +0000 (20:29 +0000)]

Merge "Merge "Disable test in presubmit" into oc-dr1-dev am: 21fe942d88" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:29:02 +0000 (20:29 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp
am: 0dda017310

Change-Id: I54c1be96f0c5521505f1f2f19103ccf3605e99f2

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:28:48 +0000 (20:28 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp
am: 0dda017310

Change-Id: I112ed17ae6bbbbef35a4d9ec3dc6d88b7ee639cd

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 20:28:42 +0000 (20:28 +0000)]

Merge "Disable test in presubmit" into oc-dr1-dev
am: 21fe942d88

Change-Id: I8cf1043c3206c6ae38bc24cf41e7cdfeb8c19d61

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:28:32 +0000 (20:28 +0000)]

Merge "Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp am: 1647883e9b"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:28:13 +0000 (20:28 +0000)]

Merge "Merge "Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928" into oc-dr1-dev am: bc0afda3d2" into oc-dr1-dev-plus-aosp

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.