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

Anthony Chen [Thu, 6 Jul 2017 21:46:50 +0000 (21:46 +0000)]

Merge "Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev am: 25c84b3321" into oc-dr1-dev-plus-aosp
am: 7730f5ad86

Change-Id: Id53671bbdefa0683c19e84f245cf60ba9460278c

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:44:25 +0000 (21:44 +0000)]

Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136" into oc-dev-plus-aosp am: 18c691899b" into oc-dr1-dev-plus-aosp
am: a45d75a5b2

Change-Id: I4a9cafc6fd0a6cb806874a803e032ffc0969c7a5

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:42:10 +0000 (21:42 +0000)]

Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136" into oc-dev-plus-aosp am: 18c691899b" into oc-dr1-dev-plus-aosp
am: 9011f1b5d1

Change-Id: Iad8385c989c3ef95526ca20881c281bd70f51feb

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:39:30 +0000 (21:39 +0000)]

Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136 am: e45205825f" into oc-dr1-dev-plus-aosp
am: d48f1e5bb2

Change-Id: I9f1d12ee0256aa33ec2bf69333ccaadb28f714ef

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:36:45 +0000 (21:36 +0000)]

Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136 am: e45205825f
am: 48f04c9da2

Change-Id: I44b433ac58d83ad029ee74e211385e0bd6e1ab19

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:35:25 +0000 (21:35 +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: b9545440e2 -s ours

Change-Id: I4d91b6346803be1dd5909f59772c3ea6b4573854

commit | commitdiff | tree

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

Merge "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: 3f2c203353 -s ours" into oc-dr1-dev-plus-aosp am: 510764b5b8 -s ours"

commit | commitdiff | tree

Colin Cross [Thu, 6 Jul 2017 21:30:30 +0000 (21:30 +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: 3f2c203353 -s ours" into oc-dr1-dev-plus-aosp
am: 510764b5b8 -s ours

Change-Id: I8e4103d386ac291a395a75d044b389e53516a8ac

commit | commitdiff | tree

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

Merge "Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev am: 25c84b3321" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

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

Merge "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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136" into oc-dev-plus-aosp am: 18c691899b" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Anthony Chen [Thu, 6 Jul 2017 21:28:45 +0000 (21:28 +0000)]

Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev
am: 25c84b3321

Change-Id: Ie222fff825cb06fd50b1fff8c1e9dd545da0ef41

commit | commitdiff | tree

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

Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136" into oc-dev-plus-aosp am: 18c691899b" into oc-dr1-dev-plus-aosp

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: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: I6a93bef8b0b2d9f78741b927dcd742e1508374d9

commit | commitdiff | tree

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

Merge "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"

commit | commitdiff | tree

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

Merge "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"

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:27:25 +0000 (21:27 +0000)]

Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136" into oc-dev-plus-aosp
am: 18c691899b

Change-Id: I57bf501cb54bf2a8aeff64e7987d8bb88598784f

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:27:04 +0000 (21:27 +0000)]

Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136" into oc-dev-plus-aosp
am: 18c691899b

Change-Id: Iaa597bd739ba89dc98a8f3d30d451754c937213f

commit | commitdiff | tree

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

Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136 am: e45205825f" into oc-dr1-dev-plus-aosp

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:26:30 +0000 (21:26 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 21:26:01 +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 am: cf031d4122 -s ours"

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:24:53 +0000 (21:24 +0000)]

Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136
am: e45205825f

Change-Id: I74890548411e0dacf8763319dcd55237128965e2

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

Colin Cross [Thu, 6 Jul 2017 21:24:31 +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: I0475a9b2a5b76318ba1d41690868e4ad51a06dbc

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:24:27 +0000 (21:24 +0000)]

Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136
am: e45205825f

Change-Id: I703cfcec537911bb46b917b93ed6647031bf3ba6

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

Android Build Merger (Role) [Thu, 6 Jul 2017 21:20:19 +0000 (21:20 +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:19:57 +0000 (21:19 +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: 3f2c203353 -s ours" into oc-dr1-dev-plus-aosp

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:19:05 +0000 (21:19 +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: 3f2c203353 -s ours

Change-Id: Icc718257845acb87b79784bb941ed61078a554b8

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

Colin Cross [Thu, 6 Jul 2017 21:18:33 +0000 (21:18 +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: I4d5fc08c050c1fb7be5ef1db55a20698e863b93d

commit | commitdiff | tree

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

Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136" into oc-dev-plus-aosp

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)]

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

Alex Light [Thu, 6 Jul 2017 21:16:51 +0000 (21:16 +0000)]

Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f
am: c9b8de6136

Change-Id: If90472d31e9c46b9848d3aa29b548beecbe1978a

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:15:59 +0000 (21:15 +0000)]

Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f
am: c9b8de6136

Change-Id: Ia613ba66564bb881339569055205165e5f4c00b1

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

Anthony Chen [Thu, 6 Jul 2017 21:14:47 +0000 (21:14 +0000)]

Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev

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:11:06 +0000 (21:11 +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

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

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

Change-Id: I0833d345749714ccd8a9feb9e1e495f540253fd0

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:10:11 +0000 (21:10 +0000)]

Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am: a4267fd89f

Change-Id: If31e5d218bd00b3281923c80cd4f61ca734d4388

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

Alex Light [Thu, 6 Jul 2017 21:03:24 +0000 (21:03 +0000)]

Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"

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)]

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)]

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)]

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)]