OSDN Git Service
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Fyodor Kupolov [Mon, 25 Apr 2016 17:03:34 +0000 (17:03 +0000)]
Merge "Return null when user is locked" into nyc-dev
Jeff Sharkey [Mon, 25 Apr 2016 16:34:11 +0000 (16:34 +0000)]
Merge "Strings for post-upgrade." into nyc-dev
Winson Chung [Mon, 25 Apr 2016 16:25:49 +0000 (16:25 +0000)]
Merge "Fixing animation regression due to ag/957220." into nyc-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Bill Yi [Mon, 25 Apr 2016 15:09:04 +0000 (15:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:08:46 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:08:30 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:08:08 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 15:07:50 +0000 (15:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
John Reck [Mon, 25 Apr 2016 15:05:05 +0000 (15:05 +0000)]
Merge "PixelCopy fixes" into nyc-dev
am:
a5bbbe5
* commit '
a5bbbe55b74d3a835b64fa18959f487da2df967e':
PixelCopy fixes
Change-Id: I0da1b908278f385010662678be6eea6de6910d03
John Reck [Mon, 25 Apr 2016 15:05:03 +0000 (15:05 +0000)]
Merge "PixelCopy fixes" into nyc-dev
am:
a5bbbe5
* commit '
a5bbbe55b74d3a835b64fa18959f487da2df967e':
PixelCopy fixes
Change-Id: I4a49425cea5316ac4c977432c60caf9a6f667b76
John Reck [Mon, 25 Apr 2016 14:55:27 +0000 (14:55 +0000)]
Merge "PixelCopy fixes" into nyc-dev
Calin Juravle [Fri, 22 Apr 2016 16:43:07 +0000 (17:43 +0100)]
Disable StrictMode policy when setting up profile support
Bug:
28304158
Change-Id: Iedf8714bd4f3526823b3060b30e0f11c6c0abcea
Android Build Merger (Role) [Mon, 25 Apr 2016 13:25:57 +0000 (13:25 +0000)]
Merge "Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am:
4ace836 am:
eeec588" into nyc-mr1-dev-plus-aosp
Ricky Wai [Mon, 25 Apr 2016 13:25:32 +0000 (13:25 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am:
4ace836
am:
eeec588
* commit '
eeec588948f5a9cdc22115f28d21828d18fc014b':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: I62700b1d542429b0e95c95a2beb9a36623a186f7
Ricky Wai [Mon, 25 Apr 2016 13:25:30 +0000 (13:25 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am:
4ace836
am:
e4c8276
* commit '
e4c827662a39c7c31481f68d738dd9de01a831b1':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: If1fe100d177986abff459485a1683a66e38a8dc6
Ricky Wai [Mon, 25 Apr 2016 13:20:37 +0000 (13:20 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
am:
4ace836
* commit '
4ace8366619d04d326505ad689c5d43707f2aaea':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: I2b6fe365bf3556d9fba5ac3c2c7580ded28dc644
Ricky Wai [Mon, 25 Apr 2016 13:20:35 +0000 (13:20 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
am:
4ace836
* commit '
4ace8366619d04d326505ad689c5d43707f2aaea':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: I43068aca865678a7c1a3f5f0d65aeaa6651b7d43
Ricky Wai [Mon, 25 Apr 2016 13:11:44 +0000 (13:11 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 13:05:02 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
90edb46 -s ours
am:
67aa5e6 -s ours
* commit '
67aa5e68b0357d96c3b588c6a9ad37a073e20d1d':
Change-Id: I956bdfc597e80a34f5fcdd92361fa55606fc5cfe
Bill Yi [Mon, 25 Apr 2016 12:59:33 +0000 (12:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
90edb46 -s ours
am:
ad145e5 -s ours
* commit '
ad145e503eee7aba6d61923b39b39c343021a737':
Import translations. DO NOT MERGE
Change-Id: I3a93748beebe7a50dbe3c1b19b2bf0c9b58af54d
Bill Yi [Mon, 25 Apr 2016 12:54:27 +0000 (12:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
90edb46 -s ours
* commit '
90edb46d017f793401f65c64368a7a4cf6f881f9':
Import translations. DO NOT MERGE
Change-Id: I01ff764d1309b22b4bcb0fb9512a314aee9587ab
Bill Yi [Mon, 25 Apr 2016 12:54:26 +0000 (12:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
90edb46 -s ours
* commit '
90edb46d017f793401f65c64368a7a4cf6f881f9':
Import translations. DO NOT MERGE
Change-Id: I117fb5328c018acba51075910c78af1ac4fa9035
Bill Yi [Mon, 25 Apr 2016 12:49:00 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 12:12:11 +0000 (05:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie8ab19f46d7eebd00b7d1cc476ebd153d733ceb0
Auto-generated-cl: translation import
Bill Yi [Mon, 25 Apr 2016 11:58:49 +0000 (04:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I052034274afbe75c7898cd0360ea627abed0dd19
Auto-generated-cl: translation import
Calin Juravle [Mon, 25 Apr 2016 11:57:14 +0000 (11:57 +0000)]
Merge "Handle dalvik.vm.usejitprofiles property" am:
028a233 am:
a483833
am:
4025064
* commit '
4025064ddabf9149d2dc9ba8d4e180ecbd6eea36':
Handle dalvik.vm.usejitprofiles property
Change-Id: I6db292b3ea67c6943e3bda632da9f8b523079a62
Bill Yi [Mon, 25 Apr 2016 11:54:12 +0000 (04:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic8c6b11898eaccb7327492bbf5d1aaff9070f135
Auto-generated-cl: translation import
Calin Juravle [Mon, 25 Apr 2016 11:52:09 +0000 (11:52 +0000)]
Merge "Handle dalvik.vm.usejitprofiles property" am:
028a233
am:
a483833
* commit '
a4838330667a0db03510ac725c1704848e4306e1':
Handle dalvik.vm.usejitprofiles property
Change-Id: Ia196229732c57f9c2a1cbf5098e78402409c6dec
Bill Yi [Mon, 25 Apr 2016 11:49:48 +0000 (04:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0812aa0343d38d49e868e1e8fd895cb9d924b366
Auto-generated-cl: translation import
Bill Yi [Mon, 25 Apr 2016 11:45:05 +0000 (04:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icf2694bb659505ee340498f007c1f303b006b5d0
Auto-generated-cl: translation import
Calin Juravle [Mon, 25 Apr 2016 11:15:26 +0000 (11:15 +0000)]
Merge "Handle dalvik.vm.usejitprofiles property"
am:
028a233
* commit '
028a23367c1a299cae6fa1b96ff53e59d54b3ee6':
Handle dalvik.vm.usejitprofiles property
Change-Id: I43f07fab627f18ed3178503b2f73dab584a8cae1
Calin Juravle [Mon, 25 Apr 2016 11:09:00 +0000 (11:09 +0000)]
Merge "Handle dalvik.vm.usejitprofiles property"
Ricky Wai [Fri, 15 Apr 2016 16:20:12 +0000 (17:20 +0100)]
Make "work mode on dialog" show personal challenge in unified work lock
Bug:
28183335
Change-Id: Ib212b283b9561f88899f6e7ea130944391b6e558
Android Build Merger (Role) [Mon, 25 Apr 2016 10:24:24 +0000 (10:24 +0000)]
Merge "Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev am:
0c9c09c am:
ed6bdaa" into nyc-mr1-dev-plus-aosp
Rubin Xu [Mon, 25 Apr 2016 10:23:59 +0000 (10:23 +0000)]
Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev am:
0c9c09c
am:
ed6bdaa
* commit '
ed6bdaaf380939779bb06dc51af88098c3c3aac1':
Regenerate ApplicationInfo if package suspend state is changed.
Change-Id: Id8238d5ec73cc8f922913b3640d1984911df2bfb
Rubin Xu [Mon, 25 Apr 2016 10:23:55 +0000 (10:23 +0000)]
Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev am:
0c9c09c
am:
b3e7163
* commit '
b3e71637e7167658c6b46e591d0a7addf255b9e6':
Regenerate ApplicationInfo if package suspend state is changed.
Change-Id: I50f214daf8818529c32358bbb4658bdf4ef41769
Rubin Xu [Mon, 25 Apr 2016 10:19:10 +0000 (10:19 +0000)]
Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
am:
0c9c09c
* commit '
0c9c09ccff72c9a017e6c7da3aef8738eea5f176':
Regenerate ApplicationInfo if package suspend state is changed.
Change-Id: I4d519180d99f4d1cbac35d0167e99217da4da9f8
Rubin Xu [Mon, 25 Apr 2016 10:19:08 +0000 (10:19 +0000)]
Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
am:
0c9c09c
* commit '
0c9c09ccff72c9a017e6c7da3aef8738eea5f176':
Regenerate ApplicationInfo if package suspend state is changed.
Change-Id: Ife031be013d9a06cb3f1e4f27b4da16d50e91e8a
Rubin Xu [Mon, 25 Apr 2016 10:12:01 +0000 (10:12 +0000)]
Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
Tobias Thierer [Mon, 25 Apr 2016 09:59:09 +0000 (09:59 +0000)]
Merge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev-plus-aosp
am:
cc0eaf4
* commit '
cc0eaf4124011d8a370f3c354e241887a633e8f1':
Avoid instantiations of Boolean that are immediately unboxed.
Change-Id: Ia4ea8bbd2a4fd5cb3094f3682034542b8f7d8e80
Tobias Thierer [Mon, 25 Apr 2016 09:51:41 +0000 (09:51 +0000)]
Merge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev-plus-aosp
Shubham Ajmera [Mon, 25 Apr 2016 09:48:34 +0000 (09:48 +0000)]
Tobias Thierer [Thu, 21 Apr 2016 16:51:41 +0000 (17:51 +0100)]
Avoid instantiations of Boolean that are immediately unboxed.
Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).
Also fixed a couple of other valueOf()s in SyncStorageEngine.
Bug:
28289401
(cherry-picked from commit
ca0182073530a237babe65b9ec7a9b41e667f8d1)
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc
Android Build Merger (Role) [Mon, 25 Apr 2016 09:44:58 +0000 (09:44 +0000)]
Merge "Merge "Merge "Avoid instantiations of Boolean that are immediately unboxed." am:
823e05b am:
71502c44 -s ours" into nyc-dev-plus-aosp am:
8a67647" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Apr 2016 09:44:54 +0000 (09:44 +0000)]
Merge "Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am:
f48f390 am:
35a7503" into nyc-mr1-dev-plus-aosp
Tobias Thierer [Mon, 25 Apr 2016 09:44:29 +0000 (09:44 +0000)]
Merge "Merge "Avoid instantiations of Boolean that are immediately unboxed." am:
823e05b am:
71502c44 -s ours" into nyc-dev-plus-aosp
am:
8a67647
* commit '
8a676470b9269182de029484fd0eaa1a85811934':
Avoid instantiations of Boolean that are immediately unboxed.
Change-Id: I195f42e269c714830044bc5e6917ebaa9e3b61f7
Clara Bayarri [Mon, 25 Apr 2016 09:44:28 +0000 (09:44 +0000)]
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am:
f48f390
am:
dea459c
* commit '
dea459c750b87b26bde8cb0ac6f843160798d943':
Improve KeyboardShortcutInfo documentation for Modifiers
Change-Id: I2bdbfc04cde9fd6d83d8e4d6f0ee2a90bb96c538
Clara Bayarri [Mon, 25 Apr 2016 09:44:28 +0000 (09:44 +0000)]
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am:
f48f390
am:
35a7503
* commit '
35a7503e9b12b8e72f00efcad2fcf02aac002af8':
Improve KeyboardShortcutInfo documentation for Modifiers
Change-Id: I1c63f9a46f83d538fa7e20430efb1b6ea7355959
Neil Fuller [Mon, 25 Apr 2016 09:43:55 +0000 (09:43 +0000)]
Android Build Merger (Role) [Mon, 25 Apr 2016 09:40:11 +0000 (09:40 +0000)]
Merge "Merge "Avoid instantiations of Boolean that are immediately unboxed." am:
823e05b am:
71502c44 -s ours" into nyc-dev-plus-aosp
OSDN Git Service
