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

Ruchi Kandoi [Thu, 6 Jul 2017 23:16:19 +0000 (23:16 +0000)]

Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52 am: 67d3257519
am: a404bfb348

Change-Id: Ieae4a4211b18a03e81068b39948dbfd18272df3d

commit | commitdiff | tree

Love Khanna [Thu, 6 Jul 2017 23:15:04 +0000 (23:15 +0000)]

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: a161427214
am: 308f484f7c

Change-Id: I6d1c8f8aee7d82da3b31de0552d73c6710e5663f

commit | commitdiff | tree

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

Merge "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 am: 320c40390d"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge "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 am: 320c40390d"

commit | commitdiff | tree

Matthew Ng [Thu, 6 Jul 2017 23:03:18 +0000 (23:03 +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
am: 320c40390d

Change-Id: I5199361a5563e479c07f0d41ad16ea1f9c7a200b

commit | commitdiff | tree

Matthew Ng [Thu, 6 Jul 2017 23:01:19 +0000 (23:01 +0000)]

commit | commitdiff | tree

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

Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719 am: 77b4424baa"

commit | commitdiff | tree

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

Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719 am: 77b4424baa"

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 22:59:47 +0000 (22:59 +0000)]

Merge "Have bit grant permissions to installed APKs."

commit | commitdiff | tree

Matthew Ng [Thu, 6 Jul 2017 22:59:29 +0000 (22:59 +0000)]

Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719
am: 77b4424baa

Change-Id: I40c3a5eca13d6f194c6bf116293ae00db4896468

commit | commitdiff | tree

Matthew Ng [Thu, 6 Jul 2017 22:58:48 +0000 (22:58 +0000)]

Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am: 407c4c5719
am: 77b4424baa

Change-Id: I6bfe305a741ccbb91967935e083e5f3e18a5e41e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 22:38:49 +0000 (22:38 +0000)]

Merge "Fix NPE in BitmapFactory when an allocation of hw bitmap failed"

commit | commitdiff | tree

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

commit | commitdiff | tree

Adam Lesinski [Thu, 6 Jul 2017 22:37:45 +0000 (22:37 +0000)]

Merge "AAPT2: Iterate over UTF-8 string by codepoints"

commit | commitdiff | tree

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

Merge "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 am: 0398a0d1bd -s ours"

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 22:26:57 +0000 (22:26 +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
am: 0398a0d1bd -s ours

Change-Id: Ie7dcdd583791b1828d09af35a33646e50b9cbc64

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 22:26:43 +0000 (22:26 +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
am: 0398a0d1bd -s ours

Change-Id: I929e2db602b3b927ac2bd46f04324fc3021d1302

commit | commitdiff | tree

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

Merge "Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619 am: 932f36050c -s ours"

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 22:22:37 +0000 (22:22 +0000)]

Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619
am: 932f36050c -s ours

Change-Id: I7753c7042f79d98a36a01a56a832b62645143145

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 22:22:06 +0000 (22:22 +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:20:56 +0000 (22:20 +0000)]

Merge "Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619 am: 932f36050c -s ours"

commit | commitdiff | tree

Jason Monk [Thu, 6 Jul 2017 22:20:51 +0000 (22:20 +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: I34661d918ac9342353e5f0bebb1c87e8561d70ae

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 22:19:31 +0000 (22:19 +0000)]

Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e619
am: 932f36050c -s ours

Change-Id: I725fca68477839d764812689861ecfa4ae663bd9

commit | commitdiff | tree

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

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

Change-Id: I0aa0b255d943fb61da61a2ab7fdd511e39588f19

commit | commitdiff | tree

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

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

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

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

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

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

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

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

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