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

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Rubin Xu [Mon, 25 Apr 2016 18:20:03 +0000 (18:20 +0000)]

Merge "Add back protected profile availibility broadcasts." into nyc-dev am: cda5089 am: f8a52ef
am: 4038a3a

* commit '4038a3a8a957db4d41eabfd4d3a49658790a72c8':
Add back protected profile availibility broadcasts.

Change-Id: Ib3da0c9dee84b400343086949e086040e98ca0af

commit | commitdiff | tree

Rubin Xu [Mon, 25 Apr 2016 18:14:46 +0000 (18:14 +0000)]

Merge "Add back protected profile availibility broadcasts." into nyc-dev am: cda5089
am: f8a52ef

* commit 'f8a52efc8e41f515e16ebb045b41044b0f4696cd':
Add back protected profile availibility broadcasts.

Change-Id: I42a73461ef46f30ffe742244cecf9f048a0d8393

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 18:10:34 +0000 (18:10 +0000)]

Merge "Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev am: 442fd2a am: c83cefc" into nyc-mr1-dev-plus-aosp
am: 60e114f

* commit '60e114f465d864a70f6a2bc7f5344ff488bb4ac9':

Change-Id: I1b25ae616434c7d9a5a9c59bb2c842c7fcf311c4

commit | commitdiff | tree

Selim Cinek [Mon, 25 Apr 2016 18:10:31 +0000 (18:10 +0000)]

Merge "Merge "Added the ripple drawable back to the media notification" into nyc-dev am: 08b38f8 am: cc042f3" into nyc-mr1-dev-plus-aosp
am: eba859f

* commit 'eba859f9f78209afb37948e0ab250458a9b5f01f':

Change-Id: Ifb9a573314f2e4684549770935a9d2acd10dea43

commit | commitdiff | tree

Wale Ogunwale [Mon, 25 Apr 2016 18:10:28 +0000 (18:10 +0000)]

Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev am: 442fd2a am: 5cca61d
am: 1f2d8db

* commit '1f2d8dbe6ea089408f381f813b8c4138a763b084':
Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK

Change-Id: I31e87afcdd433b276c2cac9306bac006473a083b

commit | commitdiff | tree

Selim Cinek [Mon, 25 Apr 2016 18:10:23 +0000 (18:10 +0000)]

Merge "Added the ripple drawable back to the media notification" into nyc-dev am: 08b38f8 am: 13654c9
am: 58d7e3d

* commit '58d7e3d44fb926cd7ada5f5aaae9ee4528992563':
Added the ripple drawable back to the media notification

Change-Id: Iace982d408336311b14552244e8a7271067ddaec

commit | commitdiff | tree

Rubin Xu [Mon, 25 Apr 2016 18:09:36 +0000 (18:09 +0000)]

Merge "Add back protected profile availibility broadcasts." into nyc-dev
am: cda5089

* commit 'cda50893b623f19834114eb225d78fceb70b8aca':
Add back protected profile availibility broadcasts.

Change-Id: Ifdc256f382896797d340d7f17061188738e8962f

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 18:05:21 +0000 (18:05 +0000)]

Merge "Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev am: 442fd2a am: c83cefc" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 18:05:06 +0000 (18:05 +0000)]

Merge "Merge "Added the ripple drawable back to the media notification" into nyc-dev am: 08b38f8 am: cc042f3" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 18:04:40 +0000 (18:04 +0000)]

Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev am: 442fd2a
am: c83cefc

* commit 'c83cefc22473cee3d6a7d88dbb5186823f65fce1':
Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK

Change-Id: I8c741566002548ba2071f1521d06429dac4bf515

commit | commitdiff | tree

Selim Cinek [Mon, 25 Apr 2016 18:04:39 +0000 (18:04 +0000)]

Merge "Added the ripple drawable back to the media notification" into nyc-dev am: 08b38f8
am: cc042f3

* commit 'cc042f3882bcbfe6349b17712dd0d851a1087163':
Added the ripple drawable back to the media notification

Change-Id: I0d99bc4aa3ed757f378ff23c08ce26856de20872

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 18:04:33 +0000 (18:04 +0000)]

Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev am: 442fd2a
am: 5cca61d

* commit '5cca61d3f7d313a6181f8f68858d48d8dc58cf27':
Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK

Change-Id: I383c76c49653361c7dbd3ca82be8f06fdd16e120

commit | commitdiff | tree

Selim Cinek [Mon, 25 Apr 2016 18:04:30 +0000 (18:04 +0000)]

Merge "Added the ripple drawable back to the media notification" into nyc-dev am: 08b38f8
am: 13654c9

* commit '13654c941cd86ac38cb9ded99ceff8aa880eb7ff':
Added the ripple drawable back to the media notification

Change-Id: I44b1e9f9fae927429e06118ee13ce15b020264b9

commit | commitdiff | tree

Wale Ogunwale [Mon, 25 Apr 2016 17:58:56 +0000 (17:58 +0000)]

Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev
am: 442fd2a

* commit '442fd2a1ddcfde18887ae712649695d6e7c384b3':
Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK

Change-Id: If828666aa95d92281998838740a3fad8a9855b17

commit | commitdiff | tree

Wale Ogunwale [Mon, 25 Apr 2016 17:58:56 +0000 (17:58 +0000)]

Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev
am: 442fd2a

* commit '442fd2a1ddcfde18887ae712649695d6e7c384b3':
Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK

Change-Id: I505031cfb8fa177ef968dfe2a4170e31542147ec

commit | commitdiff | tree

Selim Cinek [Mon, 25 Apr 2016 17:58:55 +0000 (17:58 +0000)]

Merge "Added the ripple drawable back to the media notification" into nyc-dev
am: 08b38f8

* commit '08b38f87ef297ed792f25041e10d036eb6f58c82':
Added the ripple drawable back to the media notification

Change-Id: Iac5eb83358ebb03f4858c2dfe74ca761a9c77396

commit | commitdiff | tree

Selim Cinek [Mon, 25 Apr 2016 17:58:53 +0000 (17:58 +0000)]

Merge "Added the ripple drawable back to the media notification" into nyc-dev
am: 08b38f8

* commit '08b38f87ef297ed792f25041e10d036eb6f58c82':
Added the ripple drawable back to the media notification

Change-Id: I33e31b53762ef1d080f8dc20e81f63b6d52bcae1

commit | commitdiff | tree

Rubin Xu [Mon, 25 Apr 2016 17:58:28 +0000 (17:58 +0000)]

Merge "Add back protected profile availibility broadcasts." into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 17:51:12 +0000 (17:51 +0000)]

Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev

commit | commitdiff | tree

Rubin Xu [Mon, 25 Apr 2016 17:47:36 +0000 (18:47 +0100)]

Add back protected profile availibility broadcasts.

Bug: 27532254
Change-Id: Ifbf59f64358864cd1d48be5e797c45ec2744eac0

commit | commitdiff | tree

Selim Cinek [Mon, 25 Apr 2016 17:44:10 +0000 (17:44 +0000)]

Merge "Added the ripple drawable back to the media notification" into nyc-dev

commit | commitdiff | tree

Chong Zhang [Mon, 25 Apr 2016 17:39:00 +0000 (17:39 +0000)]

Merge "Merge "fix "am start -W" hang on activity start" into nyc-dev am: 5e40748 am: 93d22c2" into nyc-mr1-dev-plus-aosp
am: db79c0c

* commit 'db79c0cbda1a8b1891c43cda2761355fda988319':

Change-Id: Ic90d34f8b27b2c594d255ce401160ea65aa10d47

commit | commitdiff | tree

Fyodor Kupolov [Mon, 25 Apr 2016 17:38:55 +0000 (17:38 +0000)]

Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15 am: 52e1425" into nyc-mr1-dev-plus-aosp
am: 5b99c71

* commit '5b99c7149fe4a642a5c1d2612ece5272a03e268a':

Change-Id: I9dd2b9c9a94818df541e9d2ea70c07647af1a234

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 17:38:49 +0000 (17:38 +0000)]

Merge "Merge "Strings for post-upgrade." into nyc-dev am: 5dc3304 am: 75173e4" into nyc-mr1-dev-plus-aosp
am: e0ebbaa

* commit 'e0ebbaaae27263f9c48f8a7d4ea5ec7c8ba9202f':

Change-Id: I621e54f39d03f0a79d68ec2d9ae238fda2486792

commit | commitdiff | tree

Chong Zhang [Mon, 25 Apr 2016 17:38:43 +0000 (17:38 +0000)]

Merge "Merge "fix "am start -W" hang on activity start" into nyc-dev am: 5e40748 am: 81e2deb" into nyc-mr1-dev-plus-aosp
am: aa307b0

* commit 'aa307b0e0429765544bd3f6202de2146ee37ea22':
fix "am start -W" hang on activity start

Change-Id: I8fd403bf9affb8ca7523f3511a146778b4865ba3

commit | commitdiff | tree

Winson Chung [Mon, 25 Apr 2016 17:38:35 +0000 (17:38 +0000)]

Merge "Merge "Fixing animation regression due to ag/957220." into nyc-dev am: de91709 am: 4b49c7a" into nyc-mr1-dev-plus-aosp
am: 99f3d64

* commit '99f3d641840c989fae34e8da1ea3968c8bf77a6c':

Change-Id: I1adda3548ef8aa73774c1a936c46c0ccdf7ad282

commit | commitdiff | tree

Fyodor Kupolov [Mon, 25 Apr 2016 17:38:26 +0000 (17:38 +0000)]

Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15 am: 41263bf" into nyc-mr1-dev-plus-aosp
am: f43cf5e

* commit 'f43cf5ea742568c34127c1e03e69efd6c550e9cc':
Return null when user is locked

Change-Id: I5b54810085eeae13e048f6e68033c51d0d3f795d

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 17:38:14 +0000 (17:38 +0000)]

Merge "Merge "Disable StrictMode policy when setting up profile support" into nyc-dev am: 096e2dc am: 2797c12" into nyc-mr1-dev-plus-aosp
am: 5a62a19

* commit '5a62a19ed57c1a00cd187d37f26fbe4a16fc69ae':

Change-Id: Ic3ca079cf8b2292edcf12412150b0a07513cd70b

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 17:38:00 +0000 (17:38 +0000)]

Merge "Strings for post-upgrade." into nyc-dev am: 5dc3304 am: 9ad9b8b
am: 260b50b

* commit '260b50beb115f719bf4b81a436d36449b721815c':
Strings for post-upgrade.

Change-Id: I69df221c7834608a998304e9cab24deedbf84718

commit | commitdiff | tree

Winson [Mon, 25 Apr 2016 17:37:45 +0000 (17:37 +0000)]

Merge "Fixing animation regression due to ag/957220." into nyc-dev am: de91709 am: 74c195a
am: 650cc33

* commit '650cc3392e86caf6ebdc0a1a0da786614e2203cc':
Fixing animation regression due to ag/957220.

Change-Id: Ifd907429b0bde35d101280183945f3f5abf67586

commit | commitdiff | tree

Calin Juravle [Mon, 25 Apr 2016 17:37:29 +0000 (17:37 +0000)]

Merge "Disable StrictMode policy when setting up profile support" into nyc-dev am: 096e2dc am: 3a61c96
am: 64804b7

* commit '64804b759156abf7f2979a8151020faff9d026dc':
Disable StrictMode policy when setting up profile support

Change-Id: I239978da3183b412c01a98026a260daf50e6f84c

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 17:29:05 +0000 (17:29 +0000)]

Merge "Merge "fix "am start -W" hang on activity start" into nyc-dev am: 5e40748 am: 93d22c2" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 17:28:47 +0000 (17:28 +0000)]

Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15 am: 52e1425" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 17:28:33 +0000 (17:28 +0000)]

Merge "Merge "Strings for post-upgrade." into nyc-dev am: 5dc3304 am: 75173e4" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 17:28:25 +0000 (17:28 +0000)]

Merge "Merge "fix "am start -W" hang on activity start" into nyc-dev am: 5e40748 am: 81e2deb" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 17:28:18 +0000 (17:28 +0000)]

Merge "Merge "Fixing animation regression due to ag/957220." into nyc-dev am: de91709 am: 4b49c7a" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 17:28:05 +0000 (17:28 +0000)]

Merge "Merge "Return null when user is locked" into nyc-dev am: 6eb8c15 am: 41263bf" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 17:27:58 +0000 (17:27 +0000)]

Merge "Merge "Disable StrictMode policy when setting up profile support" into nyc-dev am: 096e2dc am: 2797c12" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Mon, 25 Apr 2016 17:27:12 +0000 (17:27 +0000)]

Merge "fix "am start -W" hang on activity start" into nyc-dev am: 5e40748
am: 93d22c2

* commit '93d22c2a6c884c306cbca1fb4904ef91b1511447':
fix "am start -W" hang on activity start

Change-Id: I31b86327ff2865b4017c3e78c96a3c22411fa645

commit | commitdiff | tree

Fyodor Kupolov [Mon, 25 Apr 2016 17:27:11 +0000 (17:27 +0000)]

Merge "Return null when user is locked" into nyc-dev am: 6eb8c15
am: 52e1425

* commit '52e1425a650a169b851592680542b3f2200f4815':
Return null when user is locked

Change-Id: Ied3f5c764cd84f3db3d5cd7608d81eee9722ece5

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 17:27:09 +0000 (17:27 +0000)]

Merge "Strings for post-upgrade." into nyc-dev am: 5dc3304
am: 75173e4

* commit '75173e4aa35dfbf2448377f2dedd901e3cade068':
Strings for post-upgrade.

Change-Id: Ia69d82a435456477f51af3d96ad3675dcd67b824

commit | commitdiff | tree

Winson Chung [Mon, 25 Apr 2016 17:27:06 +0000 (17:27 +0000)]

Merge "Fixing animation regression due to ag/957220." into nyc-dev am: de91709
am: 4b49c7a

* commit '4b49c7a1835c73d1be746b134c2a42bc94c8f46b':
Fixing animation regression due to ag/957220.

Change-Id: I70a644ef9de272b09c3b6297b0febb683fd66275

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 17:27:01 +0000 (17:27 +0000)]

Merge "Disable StrictMode policy when setting up profile support" into nyc-dev am: 096e2dc
am: 2797c12

* commit '2797c1234a7d3e2997955dd46bc04f4c56685870':
Disable StrictMode policy when setting up profile support

Change-Id: I82440b37089af569edad1b90d1dba36b8913b790

commit | commitdiff | tree

Chong Zhang [Mon, 25 Apr 2016 17:26:54 +0000 (17:26 +0000)]

Merge "fix "am start -W" hang on activity start" into nyc-dev am: 5e40748
am: 81e2deb

* commit '81e2deb6c27f7a688518fdb8ac52480bd5007e56':
fix "am start -W" hang on activity start

Change-Id: I180a8fb32171aa527812e5818e12ecd588d9fffd

commit | commitdiff | tree

Fyodor Kupolov [Mon, 25 Apr 2016 17:26:52 +0000 (17:26 +0000)]

Merge "Return null when user is locked" into nyc-dev am: 6eb8c15
am: 41263bf

* commit '41263bf1f73b7ea81fa11b6dcada6d5c21d1812a':
Return null when user is locked

Change-Id: Ia0648ee6777fa4c01440eb1218a6f12e5ceb9eca

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 17:26:48 +0000 (17:26 +0000)]

Merge "Strings for post-upgrade." into nyc-dev am: 5dc3304
am: 9ad9b8b

* commit '9ad9b8b61d4a1ed0315faee0b87e86587c23517b':
Strings for post-upgrade.

Change-Id: Ib0b27e49cc73577b05c7d19fd7cf6dae7546653c

commit | commitdiff | tree

Winson Chung [Mon, 25 Apr 2016 17:26:44 +0000 (17:26 +0000)]

Merge "Fixing animation regression due to ag/957220." into nyc-dev am: de91709
am: 74c195a

* commit '74c195af451a0caa9c3a300ac0712ce9bf01eec0':
Fixing animation regression due to ag/957220.

Change-Id: Ic0a9d3ccba46edc89ae7215ea15e8877e83db2ac

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 17:26:40 +0000 (17:26 +0000)]

Merge "Disable StrictMode policy when setting up profile support" into nyc-dev am: 096e2dc
am: 3a61c96

* commit '3a61c96d29b5fed0fbb4d234c46589c4763b0e11':
Disable StrictMode policy when setting up profile support

Change-Id: Ia35d5a8e5d4b86f1524c9dd69216123772ee761d

commit | commitdiff | tree

Chong Zhang [Mon, 25 Apr 2016 17:16:53 +0000 (17:16 +0000)]

Merge "fix "am start -W" hang on activity start" into nyc-dev
am: 5e40748

* commit '5e40748d3f32c0d5843855cac169e82dd15a0904':
fix "am start -W" hang on activity start

Change-Id: I3ce58ac5199653a4ef889c6deac97f012a33303e

commit | commitdiff | tree

Fyodor Kupolov [Mon, 25 Apr 2016 17:16:50 +0000 (17:16 +0000)]

Merge "Return null when user is locked" into nyc-dev
am: 6eb8c15

* commit '6eb8c15b7e07e320243fbb34999f4a34fa729ed0':
Return null when user is locked

Change-Id: If1dccaed8f2514a92edb90c17db10e02fc619272

commit | commitdiff | tree

Chong Zhang [Mon, 25 Apr 2016 17:16:47 +0000 (17:16 +0000)]

Merge "fix "am start -W" hang on activity start" into nyc-dev
am: 5e40748

* commit '5e40748d3f32c0d5843855cac169e82dd15a0904':
fix "am start -W" hang on activity start

Change-Id: I1b588c6ccd369d05afca0729d79a3102226aeff9

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 17:16:46 +0000 (17:16 +0000)]

Merge "Strings for post-upgrade." into nyc-dev
am: 5dc3304

* commit '5dc3304531b7612f1181e122a66eaf097339ae30':
Strings for post-upgrade.

Change-Id: I49394c727f6d5bfbed43dea1de9c40031c379b02

commit | commitdiff | tree

Fyodor Kupolov [Mon, 25 Apr 2016 17:16:45 +0000 (17:16 +0000)]

Merge "Return null when user is locked" into nyc-dev
am: 6eb8c15

* commit '6eb8c15b7e07e320243fbb34999f4a34fa729ed0':
Return null when user is locked

Change-Id: I7926a4226ce99d290ba60fff85b72f4a2f3cf6f3

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 17:16:43 +0000 (17:16 +0000)]

Merge "Strings for post-upgrade." into nyc-dev
am: 5dc3304

* commit '5dc3304531b7612f1181e122a66eaf097339ae30':
Strings for post-upgrade.

Change-Id: I6ccbf0118dd602cdb94c11085a4c45fb6b248856

commit | commitdiff | tree

Winson [Mon, 25 Apr 2016 17:16:42 +0000 (17:16 +0000)]

Merge "Fixing animation regression due to ag/957220." into nyc-dev
am: de91709

* commit 'de91709935b687cf747b25a48d22e9aa396bf462':
Fixing animation regression due to ag/957220.

Change-Id: I9c2356788cf01153b388097525963b06dcb681fd

commit | commitdiff | tree

Winson [Mon, 25 Apr 2016 17:16:41 +0000 (17:16 +0000)]

Merge "Fixing animation regression due to ag/957220." into nyc-dev
am: de91709

* commit 'de91709935b687cf747b25a48d22e9aa396bf462':
Fixing animation regression due to ag/957220.

Change-Id: Ib0bc962b9e789227fed652517dff63ca00e0acc6

commit | commitdiff | tree

Calin Juravle [Mon, 25 Apr 2016 17:16:38 +0000 (17:16 +0000)]

Merge "Disable StrictMode policy when setting up profile support" into nyc-dev
am: 096e2dc

* commit '096e2dcf855714577bb86eaa4869ff46b5980a07':
Disable StrictMode policy when setting up profile support

Change-Id: I2fa44b42bf2d5a3dd649ac75f032f0ebb79d3422

commit | commitdiff | tree

Calin Juravle [Mon, 25 Apr 2016 17:16:37 +0000 (17:16 +0000)]

Merge "Disable StrictMode policy when setting up profile support" into nyc-dev
am: 096e2dc

* commit '096e2dcf855714577bb86eaa4869ff46b5980a07':
Disable StrictMode policy when setting up profile support

Change-Id: I430da856430046c5e2751232b427505962615b33

commit | commitdiff | tree

Chong Zhang [Mon, 25 Apr 2016 17:08:05 +0000 (17:08 +0000)]

Merge "fix "am start -W" hang on activity start" into nyc-dev

commit | commitdiff | tree

Fyodor Kupolov [Mon, 25 Apr 2016 17:03:34 +0000 (17:03 +0000)]

Merge "Return null when user is locked" into nyc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 25 Apr 2016 16:34:11 +0000 (16:34 +0000)]

Merge "Strings for post-upgrade." into nyc-dev

commit | commitdiff | tree

Winson Chung [Mon, 25 Apr 2016 16:25:49 +0000 (16:25 +0000)]

Merge "Fixing animation regression due to ag/957220." into nyc-dev

commit | commitdiff | tree

Winson [Sat, 23 Apr 2016 23:06:50 +0000 (16:06 -0700)]

Fixing animation regression due to ag/957220.

- Ensure we clear deferred relayouts after finishing all animations in
case they trigger a deferred layout in the animation-end callback.

Bug: 28287904
Change-Id: I6d71328fb3dc4595ea67ee18cfa57d85d741e6c6

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Apr 2016 15:54:36 +0000 (15:54 +0000)]

Merge "Disable StrictMode policy when setting up profile support" into nyc-dev

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:37:44 +0000 (15:37 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4316b8a -s ours am: 2983b83 -s ours
am: 18ea64b -s ours

* commit '18ea64bca41f682d129abc939f84c02d3c637971':

Change-Id: Ib20178ddd4804636c469d1b6d1d9ae88fb36766e

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:37:42 +0000 (15:37 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 779722d -s ours am: 1883509 -s ours
am: 0ae03ae -s ours

* commit '0ae03ae8a9f1273120a7bfe39f171b8ba7f72497':

Change-Id: I1b5e3d082a2a2426539c26287b01fbfedd89599f

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:37:39 +0000 (15:37 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3496262 -s ours am: 54d4693 -s ours
am: 1a77769 -s ours

* commit '1a77769a495de082ac84fbf1c7a90e033b0d7df1':

Change-Id: Idb4077f150105d9f5a9ceeaf9a80d82a3b08a1ac

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:37:34 +0000 (15:37 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c -s ours am: 8235995 -s ours
am: 2f51b88 -s ours

* commit '2f51b88d6692882892aa42eee3def51b0382c82f':

Change-Id: I69e825dc3f86dd6cf833f7a2f343558e5b5d6092

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:37:28 +0000 (15:37 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: c8ad9db -s ours am: dad715b -s ours
am: 1ca4d16 -s ours

* commit '1ca4d162ddf549e3f7d2ce5b7a9d28c2235cfd12':

Change-Id: I2d8b900bda033742cb4d653ea91ad5bb161c47c4

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:27:06 +0000 (15:27 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4316b8a  -s ours am: d864671  -s ours
am: 984e0fc  -s ours

* commit '984e0fc8542f7825f942e5913a1e995e18712f82':
  Import translations. DO NOT MERGE

Change-Id: I8177bd8bfb54d25960b691cf03f29999319485bb

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:27:04 +0000 (15:27 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 779722d  -s ours am: 99e984e  -s ours
am: cb5a8a9  -s ours

* commit 'cb5a8a9e6a76307b44bc83133ebbfe07859c450c':
  Import translations. DO NOT MERGE

Change-Id: Ic32748ebb316585f93d5c4ea8dbce169a67df285

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:27:01 +0000 (15:27 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4316b8a -s ours
am: 2983b83 -s ours

* commit '2983b837fad0f3573e38522a7ebdce4b76543f8d':

Change-Id: I0978be5ef9d6f23499170fb6a493886aad5d6026

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:27:00 +0000 (15:27 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3496262  -s ours am: cc66c1f  -s ours
am: 9eaa1a7  -s ours

* commit '9eaa1a71c428def5984e39abad986e415f28e21d':
  Import translations. DO NOT MERGE

Change-Id: I000a43d11f505d1ddaa5e8f998c7060cf892da4f

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:26:58 +0000 (15:26 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 779722d -s ours
am: 1883509 -s ours

* commit '188350940364f04b2947f8cd675461e69b6c464f':

Change-Id: I8709dcf2f6935a2c1ee62926cb3f56bc5b6616ad

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:26:55 +0000 (15:26 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3496262 -s ours
am: 54d4693 -s ours

* commit '54d4693f986e886c3baeecea559d69c8a7d91fb5':

Change-Id: I28ee2305209b621ac72d0d19ac273f24b511bb9c

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:26:55 +0000 (15:26 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c  -s ours am: 00e13bb  -s ours
am: dd11387d  -s ours

* commit 'dd11387dd1dc662c73763935afd1c1d496e12222':
  Import translations. DO NOT MERGE

Change-Id: Ib91ba6485fbb071c811c811778f371a12cac6558

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:26:50 +0000 (15:26 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c -s ours
am: 8235995 -s ours

* commit '8235995e9cdf753bac3b5fd0659886d58983f095':

Change-Id: Ibe62f6f2157c5a404aaeaec29ad0622c9e73a1c4

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:26:49 +0000 (15:26 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: c8ad9db  -s ours am: 05675b7  -s ours
am: 5f9c41b  -s ours

* commit '5f9c41bfdfbd8801dd379b6930d4f45406cc74e5':
  Import translations. DO NOT MERGE

Change-Id: Ic3b81ae34323c85724e96761044f5cd6f48aab34

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:26:45 +0000 (15:26 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: c8ad9db -s ours
am: dad715b -s ours

* commit 'dad715bd91156ff688aa3ce1b9711fbf618306f2':

Change-Id: I0a2039648b9e7fa2cea04795c3a5691a550f7f6f

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:21:19 +0000 (15:21 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4316b8a  -s ours
am: d864671  -s ours

* commit 'd86467137fd28b9121984fc482e32823f477b662':
  Import translations. DO NOT MERGE

Change-Id: Ibf1cbcb1848c19af95a7a0acb60e837fc04e45cf

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:21:17 +0000 (15:21 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 779722d  -s ours
am: 99e984e  -s ours

* commit '99e984e15083a3c0790b59a26bf96496ec6e311d':
  Import translations. DO NOT MERGE

Change-Id: I68ad93474054466af0eb9bcf2fd3452d7c1ac273

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:21:16 +0000 (15:21 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3496262  -s ours
am: cc66c1f  -s ours

* commit 'cc66c1f9911a9cc14179b190e460eff5b94adf15':
  Import translations. DO NOT MERGE

Change-Id: I9c03567a89fd49349a61a8aa1de292a412f10871

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:21:13 +0000 (15:21 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c  -s ours
am: 00e13bb  -s ours

* commit '00e13bb466bc1636364def5c69271bcc5edeb61a':
  Import translations. DO NOT MERGE

Change-Id: I6eb3b6768bafdc7af709c9a216159d476ae3393f

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:21:10 +0000 (15:21 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev am: c8ad9db  -s ours
am: 05675b7  -s ours

* commit '05675b78ca4ff3a100dcf4797d0e85a92fb8d431':
  Import translations. DO NOT MERGE

Change-Id: I4cf4b39255aa87beb38c2d9cae170b52a18cfeb1

commit | commitdiff | tree

John Reck [Mon, 25 Apr 2016 15:15:51 +0000 (15:15 +0000)]

Merge "Merge "PixelCopy fixes" into nyc-dev am: a5bbbe5 am: 187c1d4" into nyc-mr1-dev-plus-aosp
am: 523b806

* commit '523b80618842df4c5a8ef542ef8f5868e3c9d932':

Change-Id: I03c35d23c1e9f009f72ca5ee87d089864c77571a

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:15:49 +0000 (15:15 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 4316b8a -s ours

* commit '4316b8a09d591b64f5cb944417573fef47fc453c':
Import translations. DO NOT MERGE

Change-Id: I134017901ce91019dcd7eee5ed046654dfec802a

commit | commitdiff | tree

John Reck [Mon, 25 Apr 2016 15:15:48 +0000 (15:15 +0000)]

Merge "PixelCopy fixes" into nyc-dev am: a5bbbe5 am: d928ad6
am: 00b7da2

* commit '00b7da2e1b5e58df38a876cdf93d6e006c6154cd':
PixelCopy fixes

Change-Id: I6edd921af305ca090fdf240831bd292b78f06edc

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:15:46 +0000 (15:15 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 779722d -s ours

* commit '779722d7ed84aa0d7a03a3aec93690de9c3dcb7c':
Import translations. DO NOT MERGE

Change-Id: Ia80be740114d55c73317a1366cd9282dc42be0ce

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:15:44 +0000 (15:15 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 4316b8a -s ours

* commit '4316b8a09d591b64f5cb944417573fef47fc453c':
Import translations. DO NOT MERGE

Change-Id: Idc0d1c71536b1145daa8cbdb540e72e067a3389c

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:15:43 +0000 (15:15 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 3496262 -s ours

* commit '3496262a987867f90260b467c366eb7e6be42333':
Import translations. DO NOT MERGE

Change-Id: I34fabdae2324910b66f662a0bffd2788d884ff3a

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:15:42 +0000 (15:15 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 779722d -s ours

* commit '779722d7ed84aa0d7a03a3aec93690de9c3dcb7c':
Import translations. DO NOT MERGE

Change-Id: I39eea7741f07a090ee8aa03919c5456b68a01b5f

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:15:40 +0000 (15:15 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 3496262 -s ours

* commit '3496262a987867f90260b467c366eb7e6be42333':
Import translations. DO NOT MERGE

Change-Id: I3bf9e1bd1f1a66263d17b1635acb3ac2d8e91b7d

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:15:39 +0000 (15:15 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: b6a186c -s ours

* commit 'b6a186ce5226c9f69b625f1fd016a5a7186bc2ff':
Import translations. DO NOT MERGE

Change-Id: Ia5432922cf53443a67610b3ea378013ca1cd9649

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:15:37 +0000 (15:15 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: b6a186c -s ours

* commit 'b6a186ce5226c9f69b625f1fd016a5a7186bc2ff':
Import translations. DO NOT MERGE

Change-Id: I4883f95e99133b9983d280bfdfd23f287a4595f9

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:15:34 +0000 (15:15 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c8ad9db -s ours

* commit 'c8ad9db8b0ce8d8a3301b96ba00f91af369fe38e':
Import translations. DO NOT MERGE

Change-Id: Id5466e6df122f2630d1e5a7fdcad1e63660ffaf4

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:15:34 +0000 (15:15 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c8ad9db -s ours

* commit 'c8ad9db8b0ce8d8a3301b96ba00f91af369fe38e':
Import translations. DO NOT MERGE

Change-Id: I66dc9779637507b466e97126a6607229e5c11e66

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 15:11:00 +0000 (15:11 +0000)]

Merge "Merge "PixelCopy fixes" into nyc-dev am: a5bbbe5 am: 187c1d4" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

John Reck [Mon, 25 Apr 2016 15:10:38 +0000 (15:10 +0000)]

Merge "PixelCopy fixes" into nyc-dev am: a5bbbe5
am: 187c1d4

* commit '187c1d48221dc8c51a9eaa173c34e841f31bc123':
PixelCopy fixes

Change-Id: Ia22dd307b4b6f6edb64e139059df916d15e91ad6

commit | commitdiff | tree

John Reck [Mon, 25 Apr 2016 15:10:25 +0000 (15:10 +0000)]

Merge "PixelCopy fixes" into nyc-dev am: a5bbbe5
am: d928ad6

* commit 'd928ad61e87ce8ecc1a7edae26bced459c923859':
PixelCopy fixes

Change-Id: Iaae3de7f8fd4b90856006bd7e4d3823a61168810

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 15:09:04 +0000 (15:09 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.