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

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

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

commit | commitdiff | tree

John Reck [Mon, 25 Apr 2016 14:55:27 +0000 (14:55 +0000)]

Merge "PixelCopy fixes" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Ricky Wai [Mon, 25 Apr 2016 13:20:35 +0000 (13:20 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 12:54:26 +0000 (12:54 +0000)]

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Calin Juravle [Mon, 25 Apr 2016 11:09:00 +0000 (11:09 +0000)]

Merge "Handle dalvik.vm.usejitprofiles property"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Rubin Xu [Mon, 25 Apr 2016 10:19:08 +0000 (10:19 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Shubham Ajmera [Mon, 25 Apr 2016 09:48:34 +0000 (09:48 +0000)]

Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" am: 94adc6c am: b088673
am: 7563a13

* commit '7563a13b27501b23028e4e1823472c4c33d63bf8':
Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: Idf81a1546ffa003db3d948f5a581fcfb3acecf38

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Neil Fuller [Mon, 25 Apr 2016 09:43:55 +0000 (09:43 +0000)]

Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" am: 94adc6c
am: b088673

* commit 'b0886738b65ce4e7dc9788d7ec92ee8980a45b58':
Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: Id4b3d72d2b4e4c37ae3ad982e742983be4b9cd91

commit | commitdiff | tree

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

commit | commitdiff | tree

Tobias Thierer [Mon, 25 Apr 2016 09:39:37 +0000 (09:39 +0000)]

Merge "Avoid instantiations of Boolean that are immediately unboxed." am: 823e05b
am: 71502c44 -s ours

* commit '71502c44faaf5974442f540fc616499ac5505776':
Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I4cbaea450ecf022fcec65a2679db99917ff1b1bf

commit | commitdiff | tree

Clara Bayarri [Mon, 25 Apr 2016 09:39:35 +0000 (09:39 +0000)]

Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
am: f48f390

* commit 'f48f390a60694df6f4b72bd0ac462dd19c5e1191':
Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: I36a85346b9b5a8606b75cf670ddbc67ab9831377

commit | commitdiff | tree

Clara Bayarri [Mon, 25 Apr 2016 09:39:33 +0000 (09:39 +0000)]

commit | commitdiff | tree

Shubham Ajmera [Mon, 25 Apr 2016 09:39:31 +0000 (09:39 +0000)]

Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"
am: 94adc6c

* commit '94adc6ce96c4405134141e4e7a7ff8512e2dda1b':
Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: Ie844dfe438d37abd1f708b149be51a611b7e7044

commit | commitdiff | tree

Neil Fuller [Mon, 25 Apr 2016 09:31:40 +0000 (09:31 +0000)]

Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"

commit | commitdiff | tree

Clara Bayarri [Mon, 25 Apr 2016 09:31:04 +0000 (09:31 +0000)]

Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev

commit | commitdiff | tree

Tobias Thierer [Mon, 25 Apr 2016 09:14:15 +0000 (09:14 +0000)]

Merge "Avoid instantiations of Boolean that are immediately unboxed."
am: 823e05b

* commit '823e05b2db229549c33892a0aa303fd7fb10a214':
Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I170bf470d63faec93c228ae897796a2e6067da7e

commit | commitdiff | tree

Tobias Thierer [Mon, 25 Apr 2016 09:08:43 +0000 (09:08 +0000)]

Merge "Avoid instantiations of Boolean that are immediately unboxed."

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Apr 2016 08:09:26 +0000 (08:09 +0000)]

Merge "Merge "Add state and callback logs for IpManager dump" into nyc-dev am: 7587ba8 am: 4273374" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Erik Kline [Mon, 25 Apr 2016 08:09:00 +0000 (08:09 +0000)]

Merge "Add state and callback logs for IpManager dump" into nyc-dev am: 7587ba8
am: 4273374

* commit '42733744930d651c16ffe5498baaa5c5e0c6911e':
Add state and callback logs for IpManager dump

Change-Id: Idaf19a3d4cf75f36d190e0f8ba3edc52ceb3e7bf

commit | commitdiff | tree

Erik Kline [Mon, 25 Apr 2016 08:08:57 +0000 (08:08 +0000)]

Merge "Add state and callback logs for IpManager dump" into nyc-dev am: 7587ba8
am: 2968280

* commit '296828012efc04ee81aefbf514f1f4527418d53a':
Add state and callback logs for IpManager dump

Change-Id: Idd940412342f3774f0777a81050f0e2b15bc3280

commit | commitdiff | tree

Erik Kline [Mon, 25 Apr 2016 08:03:54 +0000 (08:03 +0000)]

Merge "Add state and callback logs for IpManager dump" into nyc-dev
am: 7587ba8

* commit '7587ba86086be9bd56d13fe28904b46ae7d3c521':
Add state and callback logs for IpManager dump

Change-Id: Id40843ac659ea8e3d0319e0cf1b8a61d2895e511

commit | commitdiff | tree

Erik Kline [Mon, 25 Apr 2016 08:03:52 +0000 (08:03 +0000)]

commit | commitdiff | tree

Erik Kline [Mon, 25 Apr 2016 07:55:58 +0000 (07:55 +0000)]

Merge "Add state and callback logs for IpManager dump" into nyc-dev

commit | commitdiff | tree

Bill Yi [Mon, 25 Apr 2016 05:31:19 +0000 (22:31 -0700)]

Import translations. DO NOT MERGE

Change-Id: I1811b4ca04bc4386f233bc1bdc2b486e6ce48b01
Auto-generated-cl: translation import

commit | commitdiff | tree

Erik Kline [Fri, 22 Apr 2016 07:41:26 +0000 (16:41 +0900)]

Add state and callback logs for IpManager dump

Bug: 27605330
Change-Id: I2e659d08fa9acd57a71901f28c85a92c0876c663

commit | commitdiff | tree

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

Merge "Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e am: cb5abde" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Seigo Nonaka [Mon, 25 Apr 2016 03:47:23 +0000 (03:47 +0000)]

Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e
am: 33ed899

* commit '33ed8993e93b6c8cf0b595a5cd49fedc8c468cba':
Fix unexpected truncation again.

Change-Id: Ie27f994a7714074ddb8e3013fee648ef7a98db18

commit | commitdiff | tree

Seigo Nonaka [Mon, 25 Apr 2016 03:47:21 +0000 (03:47 +0000)]

Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e
am: cb5abde

* commit 'cb5abde896f3a8d354db6a7802114a7cd30948d8':
Fix unexpected truncation again.

Change-Id: Id0e7e8f342541874a01cc26116a727c17ee04eb4

commit | commitdiff | tree

Seigo Nonaka [Mon, 25 Apr 2016 03:42:38 +0000 (03:42 +0000)]

Merge "Fix unexpected truncation again." into nyc-dev
am: ab8913e

* commit 'ab8913e364d296fdb62e6b2572d102063bff42cb':
Fix unexpected truncation again.

Change-Id: I62bd788fccf05f4ca4c8ef5879576d48fd083086

commit | commitdiff | tree

Seigo Nonaka [Mon, 25 Apr 2016 03:42:37 +0000 (03:42 +0000)]

Merge "Fix unexpected truncation again." into nyc-dev
am: ab8913e

* commit 'ab8913e364d296fdb62e6b2572d102063bff42cb':
Fix unexpected truncation again.

Change-Id: Ie5bf5250bf17c76ac2d6add63c20fb4aa25dfffb

commit | commitdiff | tree

Seigo Nonaka [Mon, 25 Apr 2016 03:36:28 +0000 (03:36 +0000)]

Merge "Fix unexpected truncation again." into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 24 Apr 2016 14:56:22 +0000 (14:56 +0000)]

Merge "Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev am: 14d8be7 am: 83281ad" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

TreeHugger Robot [Sun, 24 Apr 2016 14:55:51 +0000 (14:55 +0000)]

Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev am: 14d8be7
am: 83281ad

* commit '83281ad147664a23791c12ed066137a5a91ccb3b':
Fixed the paddings in inbox style to match the rest of the templates

Change-Id: Iab9c15d21e6d6531c8f69f0454623a1093ec4c9c

commit | commitdiff | tree

TreeHugger Robot [Sun, 24 Apr 2016 14:55:50 +0000 (14:55 +0000)]

Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev am: 14d8be7
am: 21b28f2

* commit '21b28f2af0b619442584eb48ab020a6c1e885874':
Fixed the paddings in inbox style to match the rest of the templates

Change-Id: I1f3ccc2f6df54d71129d2b773bda4c7458dec13d

commit | commitdiff | tree

Selim Cinek [Sun, 24 Apr 2016 14:51:34 +0000 (14:51 +0000)]

Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev
am: 14d8be7

* commit '14d8be728bbca1e7d721479fa1476e23e1b7accf':
Fixed the paddings in inbox style to match the rest of the templates

Change-Id: Ia8e3f178eae3e6be06f6b557c345866261a9eac8

commit | commitdiff | tree

Selim Cinek [Sun, 24 Apr 2016 14:51:30 +0000 (14:51 +0000)]

commit | commitdiff | tree

TreeHugger Robot [Sun, 24 Apr 2016 14:44:26 +0000 (14:44 +0000)]

Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 23 Apr 2016 07:13:12 +0000 (07:13 +0000)]

Merge "Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b am: d807891" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chris Banes [Sat, 23 Apr 2016 07:12:46 +0000 (07:12 +0000)]

Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b
am: d807891

* commit 'd80789117cf2f41de41e4e4d57c2964ae989c458':
Make AbsSavedState read using given ClassLoader

Change-Id: If344423f5f4ea13a5f5b442e8a959317fe195151

commit | commitdiff | tree

Chris Banes [Sat, 23 Apr 2016 07:12:41 +0000 (07:12 +0000)]

Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b
am: bdc6966

* commit 'bdc696607baff34fa862cc910060d992a49e6ef2':
Make AbsSavedState read using given ClassLoader

Change-Id: Ib99aa96b057ba5e8fc440b54f2d21a57e1eab573

commit | commitdiff | tree

Chris Banes [Sat, 23 Apr 2016 07:09:24 +0000 (07:09 +0000)]

Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev
am: b02d51b

* commit 'b02d51b3d31b1a49ddc7c7e7db97b576d6e4f78f':
Make AbsSavedState read using given ClassLoader

Change-Id: I680a362e229c7ebbd42f344fa7446aff86fa98ae

commit | commitdiff | tree

Chris Banes [Sat, 23 Apr 2016 07:09:22 +0000 (07:09 +0000)]

commit | commitdiff | tree

Chris Banes [Sat, 23 Apr 2016 07:04:20 +0000 (07:04 +0000)]

Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 23 Apr 2016 01:54:19 +0000 (01:54 +0000)]

Merge "Merge "Fix content description for notification icons" into nyc-dev am: eefff37 am: 3a8380d" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

TreeHugger Robot [Sat, 23 Apr 2016 01:53:54 +0000 (01:53 +0000)]

Merge "Fix content description for notification icons" into nyc-dev am: eefff37
am: 3a8380d

* commit '3a8380db1056af423d784845a153855875a03c11':
Fix content description for notification icons

Change-Id: Ief4bd33a91e3526adc3757497a29ab5cb2185426

commit | commitdiff | tree

TreeHugger Robot [Sat, 23 Apr 2016 01:53:52 +0000 (01:53 +0000)]

Merge "Fix content description for notification icons" into nyc-dev am: eefff37
am: 18a98c1

* commit '18a98c1fd8ba76e43e96159fb803d27b7b6774c3':
Fix content description for notification icons

Change-Id: I78e8cfbb67ff535e18fcd6862c6353519e33cfcd

commit | commitdiff | tree

Adrian Roos [Sat, 23 Apr 2016 01:51:02 +0000 (01:51 +0000)]

Merge "Fix content description for notification icons" into nyc-dev
am: eefff37

* commit 'eefff3742de62101341128a32b227a25ed22df06':
Fix content description for notification icons

Change-Id: I35b24b57ffe34f81007cf6fb7ae860998b6ca65c

commit | commitdiff | tree

Adrian Roos [Sat, 23 Apr 2016 01:51:01 +0000 (01:51 +0000)]

commit | commitdiff | tree

TreeHugger Robot [Sat, 23 Apr 2016 01:45:00 +0000 (01:45 +0000)]

Merge "Fix content description for notification icons" into nyc-dev

commit | commitdiff | tree

Selim Cinek [Thu, 21 Apr 2016 23:40:47 +0000 (16:40 -0700)]

Fixed the paddings in inbox style to match the rest of the templates

Change-Id: Ib7701ac29d5f8a123441fbf6d95a5b0b9cadfb4e
Fixes: 27998488

commit | commitdiff | tree

TreeHugger Robot [Sat, 23 Apr 2016 01:07:34 +0000 (01:07 +0000)]

Merge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa
am: 074139b

* commit '074139b878315913ba2ae78aa0d212cade94e02c':

Change-Id: Ibd1f925feffc7c25561eea7eb13f45482d7d2717

commit | commitdiff | tree

TreeHugger Robot [Sat, 23 Apr 2016 01:04:51 +0000 (01:04 +0000)]

Merge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa
am: 40411c1

* commit '40411c158c8b071ba9175f514b1fa370ff438cc5':
Fix a regression in assist when context is disabled

Change-Id: I5beebccebd76317f06e545bbea57e999b8cdbe06

commit | commitdiff | tree

Amith Yamasani [Sat, 23 Apr 2016 01:02:02 +0000 (01:02 +0000)]

Merge "Fix a regression in assist when context is disabled" into nyc-dev
am: c3c45fa

* commit 'c3c45fa2e0c5779e3e847dd4878c2a9d1ba2fb36':
Fix a regression in assist when context is disabled

Change-Id: Ib12c5e865814f8b3c54c3e862af2191315bbc6e5

commit | commitdiff | tree

Amith Yamasani [Sat, 23 Apr 2016 01:01:58 +0000 (01:01 +0000)]

commit | commitdiff | tree

TreeHugger Robot [Sat, 23 Apr 2016 00:56:10 +0000 (00:56 +0000)]

Merge "Fix a regression in assist when context is disabled" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 23 Apr 2016 00:27:18 +0000 (00:27 +0000)]

Merge "Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717 am: 2494361" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Sat, 23 Apr 2016 00:26:48 +0000 (00:26 +0000)]

Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717
am: 2494361

* commit '2494361b0ba220038f24613da21f3e0fcdaacc1b':
BatteryStats: Fix up semantics of SamplingTimer

Change-Id: I4b839bc544847b00fabbb6c5e21ac6bff82741a5

commit | commitdiff | tree

Adam Lesinski [Sat, 23 Apr 2016 00:26:46 +0000 (00:26 +0000)]

Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717
am: 8414b87

* commit '8414b87f6cfc122af50ecddb5082f691fccf2c4c':
BatteryStats: Fix up semantics of SamplingTimer

Change-Id: I110b1dbf74db6701e112accb21471fed05c194af

commit | commitdiff | tree

Adam Lesinski [Sat, 23 Apr 2016 00:23:59 +0000 (00:23 +0000)]

Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
am: 1a8a717

* commit '1a8a717ab517e7b5ace00bb4d3370e0f3a2677b2':
BatteryStats: Fix up semantics of SamplingTimer

Change-Id: Ie2533ead98202eb9c12daa7032fe98ffd4971c56

commit | commitdiff | tree

Adam Lesinski [Sat, 23 Apr 2016 00:23:56 +0000 (00:23 +0000)]

commit | commitdiff | tree

Adam Lesinski [Sat, 23 Apr 2016 00:20:09 +0000 (00:20 +0000)]

Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 23 Apr 2016 00:16:59 +0000 (00:16 +0000)]

Merge "Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev am: b27a5fd am: c9b8b96" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jaewan Kim [Sat, 23 Apr 2016 00:16:36 +0000 (00:16 +0000)]

Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev am: b27a5fd
am: c9b8b96

* commit 'c9b8b96087fc7f7db59ece6ce4d66f49ddf3e512':
PIP: Changed the wording and background of the PIP onboarding screen

Change-Id: I451e2da82a3bc98403e404d29300ef204f746cab

commit | commitdiff | tree

Jaewan Kim [Sat, 23 Apr 2016 00:16:09 +0000 (00:16 +0000)]

Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev am: b27a5fd
am: b96a785

* commit 'b96a785916d444d9a4372f3f7b9af1f5beef1140':
PIP: Changed the wording and background of the PIP onboarding screen

Change-Id: If580b601b7f5829ab2638fddf021861793355255

commit | commitdiff | tree

Jaewan Kim [Sat, 23 Apr 2016 00:13:14 +0000 (00:13 +0000)]

Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev
am: b27a5fd

* commit 'b27a5fd45b2ae461cfa61dfff52e897d236d0d26':
PIP: Changed the wording and background of the PIP onboarding screen

Change-Id: I9eeaf9e51346ad900945a927c1c05816d9172de4

commit | commitdiff | tree

Jaewan Kim [Sat, 23 Apr 2016 00:13:09 +0000 (00:13 +0000)]

commit | commitdiff | tree

Adrian Roos [Sat, 23 Apr 2016 00:09:27 +0000 (17:09 -0700)]

Fix content description for notification icons

Change-Id: Icb4c6d8a77211d0c8922e28958609a332b19dfcc
Fixes: 27552350

commit | commitdiff | tree

Jaewan Kim [Sat, 23 Apr 2016 00:04:54 +0000 (00:04 +0000)]

Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev

commit | commitdiff | tree

Chris Tate [Fri, 22 Apr 2016 23:59:22 +0000 (23:59 +0000)]

Merge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2
am: 7b12283

* commit '7b12283f586c52e473a53ec6fa9641ba60463521':

Change-Id: I072af6c06f671b7b7f64e7056778486a8934308e

commit | commitdiff | tree

Chris Tate [Fri, 22 Apr 2016 23:57:11 +0000 (23:57 +0000)]

Merge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2
am: 352a718

* commit '352a71807cb9d24863afdb10fd4cd76733f9ed43':
Raise native-crash socket timeout

Change-Id: I15f7c2b1179553bc3a097fe9280ba4d7fc967145

commit | commitdiff | tree

Jaewan Kim [Thu, 21 Apr 2016 12:16:28 +0000 (21:16 +0900)]

PIP: Changed the wording and background of the PIP onboarding screen

Bug: 28300868
Change-Id: I73e465ddac5520e0b70098bf6a39fb85d59ad0f9

commit | commitdiff | tree

Christopher Tate [Fri, 22 Apr 2016 23:44:57 +0000 (23:44 +0000)]

Merge "Raise native-crash socket timeout" into nyc-dev
am: aa1b2e2

* commit 'aa1b2e2d4e47ae186df31ffe10f1ed05b951b753':
Raise native-crash socket timeout

Change-Id: Ie048bfcf8a0843375517f413093a604053bd255e

commit | commitdiff | tree

Christopher Tate [Fri, 22 Apr 2016 23:44:54 +0000 (23:44 +0000)]

Merge "Raise native-crash socket timeout" into nyc-dev
am: aa1b2e2

* commit 'aa1b2e2d4e47ae186df31ffe10f1ed05b951b753':
Raise native-crash socket timeout

Change-Id: I7e763182c48f7ec1fd36196e4ecf991cd602e500