OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "PixelCopy fixes" into nyc-dev am: a5bbbe5 am: d928ad6
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

8 years agoMerge "PixelCopy fixes" into nyc-dev am: a5bbbe5
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

8 years agoMerge "PixelCopy fixes" 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

8 years agoMerge "PixelCopy fixes" into nyc-dev
John Reck [Mon, 25 Apr 2016 14:55:27 +0000 (14:55 +0000)]
Merge "PixelCopy fixes" into nyc-dev

8 years agoMerge "Merge "Make "work mode on dialog" show personal challenge in unified work...
Ricky Wai [Mon, 25 Apr 2016 13:30:35 +0000 (13:30 +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
am: 5e4a6bb

* commit '5e4a6bbdc1aba5b463500bcbe70088d89cb3e10d':

Change-Id: Iba8198dbb84dc0f811003c25ac951c635f35afd0

8 years agoMerge "Make "work mode on dialog" show personal challenge in unified work lock" into...
Ricky Wai [Mon, 25 Apr 2016 13:30:32 +0000 (13:30 +0000)]
Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 4ace836 am: e4c8276
am: c6002d0

* commit 'c6002d0819a23f25dfc7fc87916d5fd82a7c4a67':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: I2170df9c34e825783dd6bfd472b7243422b2a71c

8 years agoMerge "Merge "Make "work mode on dialog" show personal challenge in unified work...
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

8 years agoMerge "Make "work mode on dialog" show personal challenge in unified work lock" into...
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

8 years agoMerge "Make "work mode on dialog" show personal challenge in unified work lock" into...
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

8 years agoMerge "Make "work mode on dialog" show personal challenge in unified work lock" into...
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

8 years agoMerge "Make "work mode on dialog" show personal challenge in unified work lock" into...
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

8 years agoMerge "Make "work mode on dialog" show personal challenge in unified work lock" into...
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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46 -s ours am: 67aa5...
Bill Yi [Mon, 25 Apr 2016 13:10:13 +0000 (13:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46  -s ours am: 67aa5e6  -s ours
am: 3595fd7  -s ours

* commit '3595fd70fcea400116d1f0d50d324762a94b0caa':

Change-Id: Ia95e2b6238fb04ed81ed589c0ea500d89000ec54

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46 -s ours
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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46 -s ours am: ad145...
Bill Yi [Mon, 25 Apr 2016 13:04:48 +0000 (13:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46  -s ours am: ad145e5  -s ours
am: 30e2307  -s ours

* commit '30e23079f3b73a935d2de17bffae01af8ee6a2aa':
  Import translations. DO NOT MERGE

Change-Id: Ia12848da8d6a28766da4ab7f1a3b0361d1467214

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46 -s ours
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

8 years agoMerge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 25 Apr 2016 12:59:11 +0000 (12:59 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 25 Apr 2016 12:58:49 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 25 Apr 2016 12:58:30 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 25 Apr 2016 12:58:09 +0000 (12:58 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 25 Apr 2016 12:57:21 +0000 (12:57 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
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

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Mon, 25 Apr 2016 12:49:00 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 25 Apr 2016 12:48:15 +0000 (12:48 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Handle dalvik.vm.usejitprofiles property" am: 028a233 am: a483833 am: 4025064
Calin Juravle [Mon, 25 Apr 2016 12:02:28 +0000 (12:02 +0000)]
Merge "Handle dalvik.vm.usejitprofiles property" am: 028a233 am: a483833 am: 4025064
am: 2665d15

* commit '2665d15b104be8042a363aafec49e6eac1565834':
  Handle dalvik.vm.usejitprofiles property

Change-Id: I21cec944a1b60d0a6c2df7a907aa77257e3c4f04

8 years agoMerge "Handle dalvik.vm.usejitprofiles property" am: 028a233 am: a483833
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

8 years agoMerge "Handle dalvik.vm.usejitprofiles property" am: 028a233
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

8 years agoMerge "Handle dalvik.vm.usejitprofiles property"
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

8 years agoMerge "Handle dalvik.vm.usejitprofiles property"
Calin Juravle [Mon, 25 Apr 2016 11:09:00 +0000 (11:09 +0000)]
Merge "Handle dalvik.vm.usejitprofiles property"

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 10:52:28 +0000 (03:52 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 10:30:42 +0000 (03:30 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Merge "Regenerate ApplicationInfo if package suspend state is changed." into...
Rubin Xu [Mon, 25 Apr 2016 10:29:03 +0000 (10:29 +0000)]
Merge "Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev am: 0c9c09c am: ed6bdaa" into nyc-mr1-dev-plus-aosp
am: 95b673a

* commit '95b673a8ca273dace52864e4d326fc85a75bbc84':

Change-Id: Ia73636ce39d33c73b5717a128fdf11d8fbdb26cc

8 years agoMerge "Regenerate ApplicationInfo if package suspend state is changed." into nyc...
Rubin Xu [Mon, 25 Apr 2016 10:29:00 +0000 (10:29 +0000)]
Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev am: 0c9c09c am: b3e7163
am: d584076

* commit 'd584076940d1d70e0c76a179e05acd833e141451':
  Regenerate ApplicationInfo if package suspend state is changed.

Change-Id: I8c7bcb654790a1afb275cb8f7d3f56ebbb0bc465

8 years agoMake "work mode on dialog" show personal challenge in unified work lock
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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 10:26:14 +0000 (03:26 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Merge "Regenerate ApplicationInfo if package suspend state is changed." into...
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

8 years agoMerge "Regenerate ApplicationInfo if package suspend state is changed." into nyc...
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

8 years agoMerge "Regenerate ApplicationInfo if package suspend state is changed." into nyc...
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

8 years agoMerge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
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

8 years agoMerge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 10:13:52 +0000 (03:13 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
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

8 years agoMerge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev...
Tobias Thierer [Mon, 25 Apr 2016 10:04:05 +0000 (10:04 +0000)]
Merge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev-plus-aosp am: cc0eaf4
am: 334a936

* commit '334a936e154fd18a301f7df860322e456ec0486e':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I626df98f9cea04e782e837e6ddf0d37690306b70

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 10:02:44 +0000 (03:02 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" am: 94adc6c...
Neil Fuller [Mon, 25 Apr 2016 09:59:14 +0000 (09:59 +0000)]
Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" am: 94adc6c am: b088673 am: 7563a13
am: e85fc0d

* commit 'e85fc0d64b31556f0ab3b553ce4d485ff6686238':
  Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: I031079b70e91b80ae0398709d136a459cb1a1596

8 years agoMerge "Avoid instantiations of Boolean that are immediately unboxed." 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

8 years agoMerge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev...
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

8 years agoMerge "Merge "Merge "Avoid instantiations of Boolean that are immediately unboxed...
Tobias Thierer [Mon, 25 Apr 2016 09:49:33 +0000 (09:49 +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
am: 5b3178c

* commit '5b3178cc76de0051e8d9e9b9e8fa58271ef2f66b':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I9304482ae874467620cef129cfea4ab4b5cbb68d

8 years agoMerge "Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc...
Clara Bayarri [Mon, 25 Apr 2016 09:49:30 +0000 (09:49 +0000)]
Merge "Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am: f48f390 am: 35a7503" into nyc-mr1-dev-plus-aosp
am: 52e33f3

* commit '52e33f35692421589b686cc09bd28b7ea194daeb':

Change-Id: I944f8d7eb5f5f1eb1ee5d0b03fdb1c61f871310a

8 years agoMerge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am...
Clara Bayarri [Mon, 25 Apr 2016 09:49:27 +0000 (09:49 +0000)]
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am: f48f390 am: dea459c
am: d3cd71b

* commit 'd3cd71b8a9c781921f6e4efe9685284bf1f4c6df':
  Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: Ia0b104bc5e689aa168bf4e7414ec82ff000c040d

8 years agoMerge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" am: 94adc6c...
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

8 years agoAvoid instantiations of Boolean that are immediately unboxed.
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

8 years agoMerge "Merge "Merge "Avoid instantiations of Boolean that are immediately unboxed...
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

8 years agoMerge "Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc...
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

8 years agoMerge "Merge "Avoid instantiations of Boolean that are immediately unboxed." am:...
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

8 years agoMerge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am...
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

8 years agoMerge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am...
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

8 years agoMerge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" am: 94adc6c
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

8 years agoMerge "Merge "Avoid instantiations of Boolean that are immediately unboxed." am:...
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

8 years agoMerge "Avoid instantiations of Boolean that are immediately unboxed." am: 823e05b
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

8 years agoMerge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
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

8 years agoMerge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
Clara Bayarri [Mon, 25 Apr 2016 09:39:33 +0000 (09:39 +0000)]
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
am: f48f390

* commit 'f48f390a60694df6f4b72bd0ac462dd19c5e1191':
  Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: If6ed2adfcefb03bfc6f06b308c8ad1629cf8d57c

8 years agoMerge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"
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

8 years agoMerge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"
Neil Fuller [Mon, 25 Apr 2016 09:31:40 +0000 (09:31 +0000)]
Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7"

8 years agoMerge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
Clara Bayarri [Mon, 25 Apr 2016 09:31:04 +0000 (09:31 +0000)]
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev

8 years agoMerge "Avoid instantiations of Boolean that are immediately unboxed."
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

8 years agoMerge "Avoid instantiations of Boolean that are immediately unboxed."
Tobias Thierer [Mon, 25 Apr 2016 09:08:43 +0000 (09:08 +0000)]
Merge "Avoid instantiations of Boolean that are immediately unboxed."

8 years agoMerge "Merge "Add state and callback logs for IpManager dump" into nyc-dev am: 7587ba...
Erik Kline [Mon, 25 Apr 2016 08:13:57 +0000 (08:13 +0000)]
Merge "Merge "Add state and callback logs for IpManager dump" into nyc-dev am: 7587ba8 am: 4273374" into nyc-mr1-dev-plus-aosp
am: 4bbdb6a

* commit '4bbdb6acc4466c5db8b19f48be6628e17fb2f63d':

Change-Id: Ic37d5a616f3f6a48dd1496c7ddc0eeac296accbc

8 years agoMerge "Add state and callback logs for IpManager dump" into nyc-dev am: 7587ba8 am...
Erik Kline [Mon, 25 Apr 2016 08:13:53 +0000 (08:13 +0000)]
Merge "Add state and callback logs for IpManager dump" into nyc-dev am: 7587ba8 am: 2968280
am: eb9326d

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

Change-Id: I82c0dc28e6b1ff6ae611984a684a9bf5279b26c2

8 years agoMerge "Merge "Add state and callback logs for IpManager dump" into nyc-dev am: 7587ba...
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

8 years agoMerge "Add state and callback logs for IpManager dump" into nyc-dev am: 7587ba8
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

8 years agoMerge "Add state and callback logs for IpManager dump" into nyc-dev am: 7587ba8
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

8 years agoMerge "Add state and callback logs for IpManager dump" into nyc-dev
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

8 years agoMerge "Add state and callback logs for IpManager dump" into nyc-dev
Erik Kline [Mon, 25 Apr 2016 08:03:52 +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: I4e0ff6b3e28bc1a197a24f9372e544d44c103de1

8 years agoMerge "Add state and callback logs for IpManager dump" into nyc-dev
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 25 Apr 2016 04:33:02 +0000 (21:33 -0700)]
Import translations. DO NOT MERGE

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

8 years agoAdd state and callback logs for IpManager dump
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

8 years agoMerge "Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e am: cb5abde...
Seigo Nonaka [Mon, 25 Apr 2016 03:52:18 +0000 (03:52 +0000)]
Merge "Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e am: cb5abde" into nyc-mr1-dev-plus-aosp
am: 67d23b6

* commit '67d23b625b3a4ddb523cbf2bc6b65f0247c41d44':

Change-Id: Ia7a54e984161df40258753ab2a46c596cd8be2d0

8 years agoMerge "Fix unexpected truncation again." into nyc-dev am: ab8913e am: 33ed899
Seigo Nonaka [Mon, 25 Apr 2016 03:52:15 +0000 (03:52 +0000)]
Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e am: 33ed899
am: b900d9f

* commit 'b900d9f77c30c92ee446c9abde81f2b0f4303f64':
  Fix unexpected truncation again.

Change-Id: I7fd698ce618c43745184883137772b776bc6166d

8 years agoMerge "Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e am: cb5abde...
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

8 years agoMerge "Fix unexpected truncation again." into nyc-dev am: ab8913e
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

8 years agoMerge "Fix unexpected truncation again." into nyc-dev am: ab8913e
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

8 years agoMerge "Fix unexpected truncation again." into nyc-dev
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

8 years agoMerge "Fix unexpected truncation again." into nyc-dev
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

8 years agoMerge "Fix unexpected truncation again." into nyc-dev
Seigo Nonaka [Mon, 25 Apr 2016 03:36:28 +0000 (03:36 +0000)]
Merge "Fix unexpected truncation again." into nyc-dev

8 years agoMerge "Merge "Fixed the paddings in inbox style to match the rest of the templates...
TreeHugger Robot [Sun, 24 Apr 2016 15:00:21 +0000 (15:00 +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
am: 6677623

* commit '6677623ca53f54b57aaefa3c51457ad757409df2':

Change-Id: Iedc481834bf082d5a3e00c9f761c76809373ead3

8 years agoMerge "Fixed the paddings in inbox style to match the rest of the templates" into...
Selim Cinek [Sun, 24 Apr 2016 15:00:18 +0000 (15:00 +0000)]
Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev am: 14d8be7 am: 21b28f2
am: 9ea6705

* commit '9ea6705d5b0dcd57a6849f26b7582b859999dff3':
  Fixed the paddings in inbox style to match the rest of the templates

Change-Id: Ic2fd4ca7b66a18aec74fd51b36a44cadbd2af85d

8 years agoMerge "Merge "Fixed the paddings in inbox style to match the rest of the templates...
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

8 years agoMerge "Fixed the paddings in inbox style to match the rest of the templates" into...
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

8 years agoMerge "Fixed the paddings in inbox style to match the rest of the templates" into...
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

8 years agoMerge "Fixed the paddings in inbox style to match the rest of the templates" into...
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

8 years agoMerge "Fixed the paddings in inbox style to match the rest of the templates" into...
Selim Cinek [Sun, 24 Apr 2016 14:51:30 +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: I1416909ca0a3580f2ce2aaa1ab7265efa0c6ba4d

8 years agoMerge "Fixed the paddings in inbox style to match the rest of the templates" into...
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

8 years agoMerge "Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d5...
Chris Banes [Sat, 23 Apr 2016 07:16:46 +0000 (07:16 +0000)]
Merge "Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b am: d807891" into nyc-mr1-dev-plus-aosp
am: b36f45d

* commit 'b36f45dd7229f9ee9dfc10761047cdabcd6104f6':

Change-Id: I1939a096ba4122c96aaed7b48d30ccf649c9a415

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b...
Chris Banes [Sat, 23 Apr 2016 07:16:42 +0000 (07:16 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b am: bdc6966
am: 9465c72

* commit '9465c720f53d3ca7d0fa2311c887b727db3fdbaf':
  Make AbsSavedState read using given ClassLoader

Change-Id: Ia1ee1a8609c3cf7815e596cc74658dc4bb04c01e

8 years agoMerge "Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d5...
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

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b
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

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b
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