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

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

Merge "Merge "Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev am: 457c58f912" into oc-dr1-dev-plus-aosp am: 0a97a0e72d"

commit | commitdiff | tree

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

Merge "Merge "Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b22979" into oc-dr1-dev-plus-aosp am: 406ed3c9c4"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:18:14 +0000 (22:18 +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
am: 0a97a0e72d

Change-Id: Id180ba138ab609287d6fb411837759b49d961b93

commit | commitdiff | tree

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

Merge "Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev am: 457c58f912 am: 3824829156"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:17:07 +0000 (22:17 +0000)]

Merge "Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b22979" into oc-dr1-dev-plus-aosp
am: 406ed3c9c4

Change-Id: I4198072198baa875517e326275fe726c8ccb0c2b

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:16:50 +0000 (22:16 +0000)]

Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev am: 457c58f912
am: 3824829156

Change-Id: I2f9d9e8be99841c625657830d7bb20d42d92746a

commit | commitdiff | tree

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

Merge "Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b22979 am: bd06bad5de"

commit | commitdiff | tree

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

Merge "Merge "Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b22979" into oc-dr1-dev-plus-aosp am: 406ed3c9c4"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:15:36 +0000 (22:15 +0000)]

Merge "Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b22979" into oc-dr1-dev-plus-aosp
am: 406ed3c9c4

Change-Id: I5e880162157bd269a17c232cd420398cdcdb46ea

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 22:15:03 +0000 (22:15 +0000)]

Merge "Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b22979 am: bd06bad5de"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:14:56 +0000 (22:14 +0000)]

Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b22979
am: bd06bad5de

Change-Id: Iad398ba0f768caed55b89b3391213c9dc1ebcb2e

commit | commitdiff | tree

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

Merge "Merge "Merge "Fix leak in ScrimView" into oc-dr1-dev am: 20b9b73e80" into oc-dr1-dev-plus-aosp am: 80b9c95cd6"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:13:55 +0000 (22:13 +0000)]

Merge "Fix crash when no StatusBarView" into oc-dr1-dev am: c424b22979
am: bd06bad5de

Change-Id: Ied19e5d1bd98c57634c336f3d930b2789bc70738

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:13:36 +0000 (22:13 +0000)]

Merge "Merge "Fix leak in ScrimView" into oc-dr1-dev am: 20b9b73e80" into oc-dr1-dev-plus-aosp
am: 80b9c95cd6

Change-Id: I5d795d383fa49a9a9bc34f97117599779cf51859

commit | commitdiff | tree

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

Merge "Merge "Merge "Fix leak in ScrimView" into oc-dr1-dev am: 20b9b73e80" into oc-dr1-dev-plus-aosp am: 80b9c95cd6"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:12:15 +0000 (22:12 +0000)]

Merge "Merge "Fix leak in ScrimView" into oc-dr1-dev am: 20b9b73e80" into oc-dr1-dev-plus-aosp
am: 80b9c95cd6

Change-Id: I765e0e7208d4e31a680c2ac2ece954334584f16f

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 22:08:25 +0000 (22:08 +0000)]

Merge "Respect the locale in vertical location of AM/PM"

commit | commitdiff | tree

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

Merge "Merge "Merge "Fix nav accessibility order" into oc-dr1-dev am: 39bf473dfb" into oc-dr1-dev-plus-aosp am: 596a12986a"

commit | commitdiff | tree

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

Merge "Merge "Fix nav accessibility order" into oc-dr1-dev am: 39bf473dfb am: 487128146e"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:06:21 +0000 (22:06 +0000)]

Merge "Merge "Fix nav accessibility order" into oc-dr1-dev am: 39bf473dfb" into oc-dr1-dev-plus-aosp
am: 596a12986a

Change-Id: I259147ea642b46e4aa740d64f20031fe8f144744

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:06:09 +0000 (22:06 +0000)]

Merge "Fix nav accessibility order" into oc-dr1-dev am: 39bf473dfb
am: 487128146e

Change-Id: I8f87f2dc652aa5c36d8753f2df31185c637e30c7

commit | commitdiff | tree

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

Merge "Merge "Fix nav accessibility order" into oc-dr1-dev am: 39bf473dfb am: 487128146e"

commit | commitdiff | tree

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

Merge "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 am: 21a5a5e1ed"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:04:39 +0000 (22:04 +0000)]

Merge "Fix nav accessibility order" into oc-dr1-dev am: 39bf473dfb
am: 487128146e

Change-Id: I3948bfe8bbaab047772b2e823f898dec2393052b

commit | commitdiff | tree

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

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 22:03:11 +0000 (22:03 +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
am: 21a5a5e1ed

Change-Id: I0243793331fb6cf5915e3a373e807b28c3110318

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 22:02:06 +0000 (22:02 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 22:00:17 +0000 (22:00 +0000)]

Merge "Update LeakChecker debug log"

commit | commitdiff | tree

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

commit | commitdiff | tree

Alex Light [Thu, 6 Jul 2017 21:59:48 +0000 (21:59 +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
am: efc9cfa89c

Change-Id: Ib051d605bab715eaa20713b478d7a5024771b0f1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 21:50:54 +0000 (21:50 +0000)]

Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change"

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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"

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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"

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 21:38:06 +0000 (21:38 +0000)]

Merge "Fix crash when no StatusBarView" into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

Alex Light [Thu, 6 Jul 2017 21:31:43 +0000 (21:31 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

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

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

TreeHugger Robot [Thu, 6 Jul 2017 21:29:57 +0000 (21:29 +0000)]

Merge "Fix leak in ScrimView" into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

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

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