OSDN Git Service
Android Build Merger (Role) [Thu, 6 Jul 2017 21:57:07 +0000 (21:57 +0000)]
Merge "Merge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp am:
1692f4d8e4" into oc-dr1-dev-plus-aosp am:
a24a5733ef"
Alex Light [Thu, 6 Jul 2017 21:55:06 +0000 (21:55 +0000)]
Merge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp am:
1692f4d8e4" into oc-dr1-dev-plus-aosp
am:
a24a5733ef
Change-Id: I094fc8e29631de40bd7c226e4b58d73340a90994
Android Build Merger (Role) [Thu, 6 Jul 2017 21:54:31 +0000 (21:54 +0000)]
Merge "Merge "Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev am:
25c84b3321" into oc-dr1-dev-plus-aosp am:
0f13bdbb58"
Anthony Chen [Thu, 6 Jul 2017 21:53:25 +0000 (21:53 +0000)]
Merge "Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev am:
25c84b3321" into oc-dr1-dev-plus-aosp
am:
0f13bdbb58
Change-Id: I827ccaecc0fab496e8f890af3971205fef9daad1
Android Build Merger (Role) [Thu, 6 Jul 2017 21:52:47 +0000 (21:52 +0000)]
Merge "Merge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp am:
1692f4d8e4" into oc-dr1-dev-plus-aosp am:
c458095bac"
TreeHugger Robot [Thu, 6 Jul 2017 21:50:54 +0000 (21:50 +0000)]
Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change"
Alex Light [Thu, 6 Jul 2017 21:50:52 +0000 (21:50 +0000)]
Merge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp am:
1692f4d8e4" into oc-dr1-dev-plus-aosp
am:
c458095bac
Change-Id: Ifd8174800f5eb3903d7e5112ce6dfeaddd02d420
Android Build Merger (Role) [Thu, 6 Jul 2017 21:50:16 +0000 (21:50 +0000)]
Merge "Merge "Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev am:
25c84b3321" into oc-dr1-dev-plus-aosp am:
7730f5ad86"
Anthony Chen [Thu, 6 Jul 2017 21:49:01 +0000 (21:49 +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: Ia9dcd84cbd7c57f79e92fc1a90655d4d5fed936b
Android Build Merger (Role) [Thu, 6 Jul 2017 21:48:27 +0000 (21:48 +0000)]
Merge "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"
Android Build Merger (Role) [Thu, 6 Jul 2017 21:48:01 +0000 (21:48 +0000)]
Merge "Merge "Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev am:
25c84b3321" into oc-dr1-dev-plus-aosp am:
7730f5ad86"
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
Alex Light [Thu, 6 Jul 2017 21:46:32 +0000 (21:46 +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: Id55e6f5267d08a42cedad3644e3d651c34fbf0d5
Android Build Merger (Role) [Thu, 6 Jul 2017 21:46:16 +0000 (21:46 +0000)]
Merge "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"
Android Build Merger (Role) [Thu, 6 Jul 2017 21:45:58 +0000 (21:45 +0000)]
Merge "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"
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
Alex Light [Thu, 6 Jul 2017 21:43:56 +0000 (21:43 +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: If5a393af40838a7a6a6c3420778ac6a2b24ea00f
Android Build Merger (Role) [Thu, 6 Jul 2017 21:43:51 +0000 (21:43 +0000)]
Merge "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"
Android Build Merger (Role) [Thu, 6 Jul 2017 21:43:12 +0000 (21:43 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f am:
c9b8de6136 am:
e45205825f" into oc-dr1-dev-plus-aosp am:
d48f1e5bb2"
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
Alex Light [Thu, 6 Jul 2017 21:41:30 +0000 (21:41 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f am:
c9b8de6136 am:
e45205825f" into oc-dr1-dev-plus-aosp
am:
d48f1e5bb2
Change-Id: I65f955b018353a5dd1fbe8e6398d16fb70f6fdc4
Android Build Merger (Role) [Thu, 6 Jul 2017 21:41:29 +0000 (21:41 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f am:
c9b8de6136 am:
e45205825f" into oc-dr1-dev-plus-aosp am:
d48f1e5bb2"
Android Build Merger (Role) [Thu, 6 Jul 2017 21:41:00 +0000 (21:41 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f am:
c9b8de6136 am:
e45205825f am:
48f04c9da2"
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
Alex Light [Thu, 6 Jul 2017 21:39:30 +0000 (21:39 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f am:
c9b8de6136 am:
e45205825f
am:
48f04c9da2
Change-Id: I65413a56bda33ebb21dcf19c402db9d1d60f1c95
Android Build Merger (Role) [Thu, 6 Jul 2017 21:38:37 +0000 (21:38 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f am:
c9b8de6136 am:
e45205825f am:
48f04c9da2"
Android Build Merger (Role) [Thu, 6 Jul 2017 21:38:25 +0000 (21:38 +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:
b9545440e2 -s ours"
Colin Cross [Thu, 6 Jul 2017 21:37:00 +0000 (21:37 +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: I866d0e7a1c9e66542d90ab01e5149e7677f6b122
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
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
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"
Android Build Merger (Role) [Thu, 6 Jul 2017 21:31:37 +0000 (21:31 +0000)]
Merge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp am:
1692f4d8e4" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 21:31:22 +0000 (21:31 +0000)]
Merge "Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev am:
25c84b3321" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 21:31:04 +0000 (21:31 +0000)]
Merge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp am:
1692f4d8e4" into oc-dr1-dev-plus-aosp
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
Anthony Chen [Thu, 6 Jul 2017 21:30:07 +0000 (21:30 +0000)]
Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev
am:
25c84b3321
Change-Id: I6068d24d239b7706b4c6d5ef440389d61eb9b54f
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
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"
Alex Light [Thu, 6 Jul 2017 21:29:48 +0000 (21:29 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp
am:
1692f4d8e4
Change-Id: Iedf7c98c04c79cda5c9e5f3117156075581fee63
Android Build Merger (Role) [Thu, 6 Jul 2017 21:29:43 +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"
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
Alex Light [Thu, 6 Jul 2017 21:29:10 +0000 (21:29 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp
am:
1692f4d8e4
Change-Id: I38e37b18e64dbd1b38c2eca18c6be1509277cc9f
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
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
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
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
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"
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"
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
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
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
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
Colin Cross [Thu, 6 Jul 2017 21:26:30 +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: Ied14b3fe6b476b194d80a49d3198bbe9940d2eb0
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"
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
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
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
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
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"
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
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
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
Android Build Merger (Role) [Thu, 6 Jul 2017 21:19:36 +0000 (21:19 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp
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
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
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
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
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
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
Alex Light [Thu, 6 Jul 2017 21:17:43 +0000 (21:17 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master
am:
dc17418da0
Change-Id: Ic560028afab1b3918c32c10efd457331b17b6abc
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
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
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
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
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
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
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
Android Build Merger (Role) [Thu, 6 Jul 2017 21:13:29 +0000 (21:13 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master
Alex Light [Thu, 6 Jul 2017 21:11:47 +0000 (21:11 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am:
a4267fd89f
Change-Id: I8cd6ee971686accf3cc832e7c0f5f18e8b4fbf2f
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
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
Alex Light [Thu, 6 Jul 2017 21:10:11 +0000 (21:10 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am:
a4267fd89f
Change-Id: If31e5d218bd00b3281923c80cd4f61ca734d4388
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"
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
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
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
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
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
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"
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
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
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"
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"
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
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"
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
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
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"
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
Alex Light [Thu, 6 Jul 2017 21:03:24 +0000 (21:03 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"