OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage...
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

7 years agoMerge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
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

7 years agoNCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0
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

7 years agoMerge "Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage...
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

7 years agoMerge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52
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

7 years agoNCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0
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

7 years agoMerge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master
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

7 years agoMerge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
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

7 years agoMerge changes from topic 'NCI-2.0' am: 430dded515
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

7 years agoMerge changes from topic 'NCI-2.0' am: 430dded515
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

7 years agoNCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11
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

7 years agoNCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11
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

7 years agoMerge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exist...
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

7 years agoMerge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master
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

7 years agoMerge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists chang...
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

7 years agoMerge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists chang...
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

7 years agoMerge changes from topic 'NCI-2.0'
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

7 years agoNCI2.0 update LF_T3T_PARAMETERS of 18 byte.
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

7 years agoMerge changes from topic 'NCI-2.0'
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

7 years agoNCI2.0 update LF_T3T_PARAMETERS of 18 byte.
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

7 years agoMerge changes from topic 'NCI-2.0'
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.

7 years agoMerge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists chang...
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

7 years agoMerge "Merge "Add a Setting for whether or not we have been disabled by policy."...
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

7 years agoMerge "Add a Setting for whether or not we have been disabled by policy." into oc...
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

7 years agoMerge "Add a Setting for whether or not we have been disabled by policy." into oc...
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

7 years agoMerge "Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev am: 457c58...
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

7 years agoMerge "Only play up effect if its been over 100 ms" into oc-dr1-dev
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

7 years agoMerge "Add a Setting for whether or not we have been disabled by policy." into oc...
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

7 years agoMerge "Only play up effect if its been over 100 ms" 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

7 years agoMerge "Only play up effect if its been over 100 ms" into oc-dr1-dev
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

7 years agoMerge "Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b22979" into...
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

7 years agoMerge "Fix crash when no StatusBarView" into oc-dr1-dev
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

7 years agoMerge "Fix crash when no StatusBarView" into oc-dr1-dev
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

7 years agoMerge "Merge "Fix leak in ScrimView" into oc-dr1-dev am: 20b9b73e80" into oc-dr1...
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

7 years agoMerge "Fix leak in ScrimView" into oc-dr1-dev
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

7 years agoMerge "Merge "Fix nav accessibility order" into oc-dr1-dev am: 39bf473dfb" into oc...
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

7 years agoMerge "Fix crash when no StatusBarView" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 21:38:06 +0000 (21:38 +0000)]
Merge "Fix crash when no StatusBarView" into oc-dr1-dev

7 years agoMerge "Fix nav accessibility order" 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

7 years agoMerge "Fix nav accessibility order" into oc-dr1-dev
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

7 years agoMerge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor...
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

7 years agoMerge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor...
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

7 years agoMerge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:...
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

7 years agoMerge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:...
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

7 years agoMerge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor...
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

7 years agoMerge "Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev am...
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

7 years agoMerge "Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor...
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

7 years agoMerge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev
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

7 years agoMerge "Merge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev am...
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

7 years agoMerge "Fix leak in ScrimView" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 21:29:57 +0000 (21:29 +0000)]
Merge "Fix leak in ScrimView" into oc-dr1-dev

7 years agoMerge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:...
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

7 years agoMerge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:...
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

7 years agoMerge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:...
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

7 years agoMerge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev
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

7 years agoMerge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:...
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

7 years agoMerge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f...
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

7 years agoMerge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f...
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

7 years agoMerge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f...
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

7 years agoMerge "Fix nav accessibility order" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 21:25:39 +0000 (21:25 +0000)]
Merge "Fix nav accessibility order" into oc-dr1-dev

7 years agoMerge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am...
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

7 years agoMerge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am...
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

7 years agoMerge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:...
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

7 years agoMerge "Merge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da6...
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

7 years agoMerge "Merge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da6...
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

7 years agoMerge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:...
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

7 years agoMerge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f...
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

7 years agoMerge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66"...
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

7 years agoMerge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66"...
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

7 years agoMerge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f...
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

7 years agoMerge "Merge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da6...
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

7 years agoMerge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am...
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

7 years agoMerge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f...
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

7 years agoMerge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66"...
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

7 years agoMerge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b...
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

7 years agoMerge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f
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

7 years agoMerge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f
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

7 years agoMerge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b...
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

7 years agoMerge "Fix bug where RemoteViews addView is backwards." into oc-dr1-dev
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

7 years agoMerge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b
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

7 years agoMerge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f...
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

7 years agoMerge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
Alex Light [Thu, 6 Jul 2017 21:11:47 +0000 (21:11 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am: a4267fd89f

Change-Id: I8cd6ee971686accf3cc832e7c0f5f18e8b4fbf2f

7 years agoMerge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66"...
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

7 years agoMerge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage...
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

7 years agoMerge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
Alex Light [Thu, 6 Jul 2017 21:10:11 +0000 (21:10 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am: a4267fd89f

Change-Id: If31e5d218bd00b3281923c80cd4f61ca734d4388

7 years agoMerge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66"...
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

7 years agoMerge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b...
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

7 years agoMerge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage...
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

7 years agoMerge "Enable priority boost for non-Jack builds." am: 847c70da66
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

7 years agoMerge "Enable priority boost for non-Jack builds." am: 847c70da66
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

7 years agoMerge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage...
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

7 years agoMerge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
Alex Light [Thu, 6 Jul 2017 21:03:24 +0000 (21:03 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"

7 years agoMerge "Enable priority boost for non-Jack builds."
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

7 years agoMerge "Enable priority boost for non-Jack builds."
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

7 years agoMerge "Enable priority boost for non-Jack builds."
Colin Cross [Thu, 6 Jul 2017 20:48:31 +0000 (20:48 +0000)]
Merge "Enable priority boost for non-Jack builds."

7 years agoMerge "Merge "Fix RTL mobile signal drawing out of bounds in QS Edit" into oc-dr1...
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

7 years agoMerge "Fix RTL mobile signal drawing out of bounds in QS Edit" into oc-dr1-dev
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

7 years agoMerge "Merge "Fix the VR virtual display height" into oc-dr1-dev am: a79a23dba5"...
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

7 years agoMerge "Fix the VR virtual display height" into oc-dr1-dev
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

7 years agoMerge "Fix the VR virtual display height" into oc-dr1-dev
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

7 years agoMerge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c...
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

7 years agoMerge "Merge "Merge "Log errors on android.os.VintfObject.verify()" am: 54b1e9c57c...
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