OSDN Git Service
Android Build Merger (Role) [Fri, 7 Jul 2017 02:41:11 +0000 (02:41 +0000)]
Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am:
730e4a5651" into oc-dr1-dev-plus-aosp
Amit Mahajan [Fri, 7 Jul 2017 02:40:05 +0000 (02:40 +0000)]
Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am:
730e4a5651
Change-Id: I9fff601c11c937d83f55275646ddf44a5bdf3acb
Amit Mahajan [Fri, 7 Jul 2017 02:37:34 +0000 (02:37 +0000)]
Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am:
730e4a5651
Change-Id: Iab30ea34531682e9e4212aa8930232121aa530bd
Antony Sargent [Fri, 7 Jul 2017 02:35:12 +0000 (02:35 +0000)]
Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev
am:
3e9d74091c
Change-Id: I43397652ec031b5cc2730dd0f8f2b8a6481a8bbe
Love Khanna [Fri, 7 Jul 2017 02:25:27 +0000 (02:25 +0000)]
Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev
am:
5cb8f220a8
Change-Id: I9c91dbb63239a4f7f6b2f1e70a690c0fb35c7119
Love Khanna [Fri, 7 Jul 2017 02:24:26 +0000 (02:24 +0000)]
AID suffix registration.
am:
68f719e196
Change-Id: I41f8fb65218cb6c959f36ac30b604629bd04a1f2
TreeHugger Robot [Thu, 6 Jul 2017 23:50:32 +0000 (23:50 +0000)]
Merge "Make dun APNs as read-only by default." into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 23:29:07 +0000 (23:29 +0000)]
Merge "Merge "Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master am:
41d6995efa" into oc-dev-plus-aosp am:
4c92af3155" into oc-dr1-dev-plus-aosp
Ruchi Kandoi [Thu, 6 Jul 2017 23:24:27 +0000 (23:24 +0000)]
Merge "Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master am:
41d6995efa" into oc-dev-plus-aosp
am:
4c92af3155
Change-Id: I9825dcb653ac21ef0c7b8f2d93addfcbd30e879e
Android Build Merger (Role) [Thu, 6 Jul 2017 23:22:04 +0000 (23:22 +0000)]
Merge changes from topic 'am-
bfe09c8870b04be684c9e4b6fd6ec81d' into oc-dr1-dev-plus-aosp
* changes:
Merge changes from topic 'am-
0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp am:
3462f03144
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0 am:
06ece4ee26
Ruchi Kandoi [Thu, 6 Jul 2017 23:15:14 +0000 (23:15 +0000)]
Merge changes from topic 'am-
0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
am:
3462f03144
Change-Id: Ia4abd92331ee0d0684d5014f2b33bbc2101935d0
Love Khanna [Thu, 6 Jul 2017 23:14:21 +0000 (23:14 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0
am:
06ece4ee26
Change-Id: Ie1d9a3b96fa415eb99f4c8e9f75b2c519734ebd0
Ruchi Kandoi [Thu, 6 Jul 2017 23:13:54 +0000 (23:13 +0000)]
Merge changes from topic 'am-
0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
am:
3462f03144
Change-Id: Ie95b06cd45924664c7a05e649fc96ac4d0f66745
Love Khanna [Thu, 6 Jul 2017 23:11:55 +0000 (23:11 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0
am:
06ece4ee26
Change-Id: I0d0fd8bd98c177df117a649a359f919b8af751ed
Android Build Merger (Role) [Thu, 6 Jul 2017 23:04:57 +0000 (23:04 +0000)]
Merge "Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master am:
41d6995efa" into oc-dev-plus-aosp
Ruchi Kandoi [Thu, 6 Jul 2017 23:04:53 +0000 (23:04 +0000)]
Merge changes from topic 'NCI-2.0' am:
430dded515 am:
4d08be4a52
am:
67d3257519
Change-Id: I77202532d60368ebc18e754a5454eb6fa1b0e5dc
Love Khanna [Thu, 6 Jul 2017 23:03:36 +0000 (23:03 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0
am:
a161427214
Change-Id: If545ea98d8c8d6a97006bcc455b55e7c665e5a66
Ruchi Kandoi [Thu, 6 Jul 2017 23:00:35 +0000 (23:00 +0000)]
Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master
am:
41d6995efa
Change-Id: I49343d3ee533b8b567edf2c76b9fbc78ad2cd235
Android Build Merger (Role) [Thu, 6 Jul 2017 22:59:15 +0000 (22:59 +0000)]
Merge changes from topic 'am-
0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'NCI-2.0' am:
430dded515 am:
4d08be4a52
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0
Ruchi Kandoi [Thu, 6 Jul 2017 22:56:47 +0000 (22:56 +0000)]
Merge changes from topic 'NCI-2.0' am:
430dded515
am:
4d08be4a52
Change-Id: Id2b2073acb3b901015b2b0d938a8cb5ee5a0270b
Ruchi Kandoi [Thu, 6 Jul 2017 22:56:19 +0000 (22:56 +0000)]
Merge changes from topic 'NCI-2.0' am:
430dded515
am:
4d08be4a52
Change-Id: Ie427005b3fa448a33c1756afdea66715914c4ff4
Love Khanna [Thu, 6 Jul 2017 22:55:46 +0000 (22:55 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11
am:
93d313b0a0
Change-Id: Iab0bd06f3f3a0d3f632e6bd5bedd8fb7c9831b90
Love Khanna [Thu, 6 Jul 2017 22:55:33 +0000 (22:55 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11
am:
93d313b0a0
Change-Id: If6952f71012f48a789c31775161720dd409bf40b
Android Build Merger (Role) [Thu, 6 Jul 2017 22:53:02 +0000 (22:53 +0000)]
Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am:
407c4c5719" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 22:52:32 +0000 (22:52 +0000)]
Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master
* changes:
Merge changes from topic 'NCI-2.0' am:
430dded515
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11
Matthew Ng [Thu, 6 Jul 2017 22:51:50 +0000 (22:51 +0000)]
Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev
am:
407c4c5719
Change-Id: Ibdaae695cb6055a0ca4b19bc70f180362b4b2bc4
Matthew Ng [Thu, 6 Jul 2017 22:51:40 +0000 (22:51 +0000)]
Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev
am:
407c4c5719
Change-Id: I85fc6bc9b19074a1be53704e91e7a776efed1cb9
Ruchi Kandoi [Thu, 6 Jul 2017 22:49:25 +0000 (22:49 +0000)]
Merge changes from topic 'NCI-2.0'
am:
430dded515
Change-Id: I3f56752a4c044c216bf1161ac778a349941ed541
Love Khanna [Thu, 6 Jul 2017 22:48:23 +0000 (22:48 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
am:
e7ecebae11
Change-Id: I285fa2cfb5e0cd34f0342d78f283c67a5ce8d7f1
Ruchi Kandoi [Thu, 6 Jul 2017 22:48:20 +0000 (22:48 +0000)]
Merge changes from topic 'NCI-2.0'
am:
430dded515
Change-Id: I264533bf8782ea66bd6959ca08f9699985273c9f
Love Khanna [Thu, 6 Jul 2017 22:47:08 +0000 (22:47 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
am:
e7ecebae11
Change-Id: Ic91ecb6a8dcb8529efda8eb0cdc99ca7758b66e6
Ruchi Kandoi [Thu, 6 Jul 2017 22:41:29 +0000 (22:41 +0000)]
Merge changes from topic 'NCI-2.0'
* changes:
AID suffix registration.
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
TreeHugger Robot [Thu, 6 Jul 2017 22:39:48 +0000 (22:39 +0000)]
Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev
* changes:
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
AID suffix registration.
TreeHugger Robot [Thu, 6 Jul 2017 22:38:16 +0000 (22:38 +0000)]
Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 22:06:55 +0000 (22:06 +0000)]
Merge "Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am:
a48cf1e619" into oc-dr1-dev-plus-aosp
Daniel Nishi [Thu, 6 Jul 2017 22:05:43 +0000 (22:05 +0000)]
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev
am:
a48cf1e619
Change-Id: I0382e247050e075f80ea94ae39509cea1e133b98
Daniel Nishi [Thu, 6 Jul 2017 22:03:36 +0000 (22:03 +0000)]
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev
am:
a48cf1e619
Change-Id: I4a1531a293f5c3493db22f73bc5511a97e756f52
Android Build Merger (Role) [Thu, 6 Jul 2017 21:59:56 +0000 (21:59 +0000)]
Merge "Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev am:
457c58f912" into oc-dr1-dev-plus-aosp
Jason Monk [Thu, 6 Jul 2017 21:58:55 +0000 (21:58 +0000)]
Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev
am:
457c58f912
Change-Id: I38573971acf0206ac3a5a8a32ae6a4577628e6a9
Daniel Nishi [Thu, 6 Jul 2017 21:58:41 +0000 (21:58 +0000)]
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 21:57:45 +0000 (21:57 +0000)]
Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev
am:
457c58f912
Change-Id: I0b37e6ac7195c94987534a4b2f6d593b3b94a36b
TreeHugger Robot [Thu, 6 Jul 2017 21:49:37 +0000 (21:49 +0000)]
Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 21:48:26 +0000 (21:48 +0000)]
Merge "Merge "Fix crash when no StatusBarView" into oc-dr1-dev am:
c424b22979" into oc-dr1-dev-plus-aosp
Jason Monk [Thu, 6 Jul 2017 21:47:25 +0000 (21:47 +0000)]
Merge "Fix crash when no StatusBarView" into oc-dr1-dev
am:
c424b22979
Change-Id: I3edd2863863cd39dc125e7f1801ea328acf0fe9c
Jason Monk [Thu, 6 Jul 2017 21:46:47 +0000 (21:46 +0000)]
Merge "Fix crash when no StatusBarView" into oc-dr1-dev
am:
c424b22979
Change-Id: I71580408161853105947dc650e8e9bbdbf34f8cd
Android Build Merger (Role) [Thu, 6 Jul 2017 21:40:48 +0000 (21:40 +0000)]
Merge "Merge "Fix leak in ScrimView" into oc-dr1-dev am:
20b9b73e80" into oc-dr1-dev-plus-aosp
Jason Monk [Thu, 6 Jul 2017 21:39:37 +0000 (21:39 +0000)]
Merge "Fix leak in ScrimView" into oc-dr1-dev
am:
20b9b73e80
Change-Id: I136c726a940bf0449539566bdda1c4e4c95817da
Android Build Merger (Role) [Thu, 6 Jul 2017 21:39:12 +0000 (21:39 +0000)]
Merge "Merge "Fix nav accessibility order" into oc-dr1-dev am:
39bf473dfb" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Thu, 6 Jul 2017 21:38:06 +0000 (21:38 +0000)]
Merge "Fix crash when no StatusBarView" into oc-dr1-dev
Jason Monk [Thu, 6 Jul 2017 21:37:58 +0000 (21:37 +0000)]
Merge "Fix nav accessibility order" into oc-dr1-dev
am:
39bf473dfb
Change-Id: Ib866d4e9f60c087de21d6499ec8dcfd9ebeff220
Jason Monk [Thu, 6 Jul 2017 21:37:02 +0000 (21:37 +0000)]
Merge "Fix nav accessibility order" into oc-dr1-dev
am:
39bf473dfb
Change-Id: Ie13cea504a8ff25105aabec866b0b1f616f4ec16
Android Build Merger (Role) [Thu, 6 Jul 2017 21:34:41 +0000 (21:34 +0000)]
Merge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp am:
55aea80a24" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 21:33:20 +0000 (21:33 +0000)]
Merge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp am:
55aea80a24" into oc-dr1-dev-plus-aosp
Alex Light [Thu, 6 Jul 2017 21:32:15 +0000 (21:32 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp
am:
55aea80a24
Change-Id: I79266df92318c645ae4bfcd8ef671c5b339e3e31
Alex Light [Thu, 6 Jul 2017 21:31:43 +0000 (21:31 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp
am:
55aea80a24
Change-Id: I06329bfdb4d3b43a7b230dae55432f47dba80fa8
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
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
TreeHugger Robot [Thu, 6 Jul 2017 21:29:57 +0000 (21:29 +0000)]
Merge "Fix leak in ScrimView" into oc-dr1-dev
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: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
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
TreeHugger Robot [Thu, 6 Jul 2017 21:25:39 +0000 (21:25 +0000)]
Merge "Fix nav accessibility order" into oc-dr1-dev
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
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:51 +0000 (21:20 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp
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
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
Alex Light [Thu, 6 Jul 2017 21:19:06 +0000 (21:19 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master
am:
dc17418da0
Change-Id: Ice4b58746d888aacf759df70146817deaff39f51
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: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: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
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