OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Report OTA time statistics" into nyc-dev am: 86f97177e9 am: 7135fab76c
Tianjie Xu [Tue, 24 May 2016 21:59:28 +0000 (21:59 +0000)]
Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 am: 7135fab76c
am: 375a512c0d

* commit '375a512c0d99e58285b3e6d6f1045c5e3a9774d5':
  Report OTA time statistics

Change-Id: Icbd611fe4af2dd51d1ee946a80c0e0f4370a9634

8 years agoMerge "Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 am...
Allen Hair [Tue, 24 May 2016 21:59:23 +0000 (21:59 +0000)]
Merge "Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 am: f90c5c5f5a" into nyc-mr1-dev-plus-aosp
am: d9d2224a65

* commit 'd9d2224a65193d3d1ad6cb26bd933865a627556e':

Change-Id: I21181cee4613821841b29e4ef85f1ea2bfd93491

8 years agoMerge "Add check for \'.end-content-title\' to force the end of content section in...
Amanda Kassay [Tue, 24 May 2016 21:48:45 +0000 (21:48 +0000)]
Merge "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1 am: 11212a4822" into nyc-mr1-dev-plus-aosp
am: b61ad7f393

* commit 'b61ad7f393b41e936383d079443759b8a9511178':

Change-Id: Idc49d4ad50c24561f3746d550102e8b1cec64a27

8 years agoMerge "Merge "Improve performance of LocaleList with Resources" into nyc-dev am:...
Adam Lesinski [Tue, 24 May 2016 21:48:39 +0000 (21:48 +0000)]
Merge "Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e5e871fdc" into nyc-mr1-dev-plus-aosp
am: 3b5dc2c480

* commit '3b5dc2c480e8003ac13ee1f87b30220793d0521c':

Change-Id: Ib8f3727987aab1ac609f8c18584f630c34065968

8 years agoMerge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 am: 79f42608c2
Allen Hair [Tue, 24 May 2016 21:48:30 +0000 (21:48 +0000)]
Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 am: 79f42608c2
am: 3faf6c2e6c

* commit '3faf6c2e6c8f215c12f1d53b86ee606059521899':
  Deprecate shell-based UI Automator.

Change-Id: Iddcd0b3b23a8cae9f8b607c7d917791c55ec95ea

8 years agoAdd check for \'.end-content-title\' to force the end of content section in an accord...
Amanda Kassay [Tue, 24 May 2016 21:48:13 +0000 (21:48 +0000)]
Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1 am: 38ffaa1c51
am: 49b9190d48

* commit '49b9190d48071802e5901c96d431c207ac8f18ff':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: I27b9856b0f1204b5a4c203bbbde49c0b7a5e1697

8 years agoMerge "Report OTA time statistics" into nyc-dev am: 86f97177e9
Tianjie Xu [Tue, 24 May 2016 21:47:52 +0000 (21:47 +0000)]
Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9
am: 7135fab76c

* commit '7135fab76cb3e7f7a68547794b3ddf54f08facca':
  Report OTA time statistics

Change-Id: I82f174bfa383a26a87d45ac6675a3ae5812b50af

8 years agoMerge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb...
Adam Lesinski [Tue, 24 May 2016 21:47:36 +0000 (21:47 +0000)]
Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e106dea45
am: 9ed84d8612

* commit '9ed84d86120dd6487eacba503f45f6d147f05fbf':
  Improve performance of LocaleList with Resources

Change-Id: I7c1694545f9eee940ca7065f3ac5aee5e2a7b27c

8 years agoMerge "Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 am...
Android Build Merger (Role) [Tue, 24 May 2016 21:42:55 +0000 (21:42 +0000)]
Merge "Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 am: f90c5c5f5a" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Add check for \'.end-content-title\' to force the end of content section in...
Android Build Merger (Role) [Tue, 24 May 2016 21:42:42 +0000 (21:42 +0000)]
Merge "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1 am: 11212a4822" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Improve performance of LocaleList with Resources" into nyc-dev am:...
Android Build Merger (Role) [Tue, 24 May 2016 21:42:31 +0000 (21:42 +0000)]
Merge "Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e5e871fdc" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7
Allen Hair [Tue, 24 May 2016 21:41:49 +0000 (21:41 +0000)]
Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7
am: f90c5c5f5a

* commit 'f90c5c5f5aaa0facbfca1a9448fde6948c907c26':
  Deprecate shell-based UI Automator.

Change-Id: Ia9c137231e0815bb0b6d703d1b538148f5d843ec

8 years agoMerge "Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into...
Jean-Michel Trivi [Tue, 24 May 2016 21:41:47 +0000 (21:41 +0000)]
Merge "Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a am: 2c5efb4827" into nyc-mr1-dev-plus-aosp
am: 4d1d0bcc4a

* commit '4d1d0bcc4a9342f2b41827d852145a2b66a795b6':

Change-Id: Ia79d02b74a9a25b046dd4cfa01ba6b754370338f

8 years agoAdd check for \'.end-content-title\' to force the end of content section in an accord...
Amanda Kassay [Tue, 24 May 2016 21:41:44 +0000 (21:41 +0000)]
Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1
am: 11212a4822

* commit '11212a48228c912feef41b97289384ac4394bb5c':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: I91e90bcc831056378654e5ee8c39d8116ab0f595

8 years agoMerge "Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f...
Adrian Roos [Tue, 24 May 2016 21:41:43 +0000 (21:41 +0000)]
Merge "Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b am: 03174b8cca" into nyc-mr1-dev-plus-aosp
am: c95cc27856

* commit 'c95cc2785627574e45018e62e5aea168b18b5cda':

Change-Id: I63aa783cbe77ceb7e5c5163022b5f335580d297e

8 years agoMerge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb
Adam Lesinski [Tue, 24 May 2016 21:41:37 +0000 (21:41 +0000)]
Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb
am: 5e5e871fdc

* commit '5e5e871fdc0b51ba5b0903169451e9401b98f1f3':
  Improve performance of LocaleList with Resources

Change-Id: I86abeb2c4edfec2aad47ac3aec4d79017e2191c8

8 years agoMerge "Merge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19...
Adrian Roos [Tue, 24 May 2016 21:41:37 +0000 (21:41 +0000)]
Merge "Merge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19 am: 8a78cbc1fa" into nyc-mr1-dev-plus-aosp
am: 3e7ba53698

* commit '3e7ba536987159b3b44db69092effdb2d669ef73':

Change-Id: Ie128608021e1f929b4962512d2843e8b07fe3dc8

8 years agoMerge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7
Allen Hair [Tue, 24 May 2016 21:41:32 +0000 (21:41 +0000)]
Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7
am: 79f42608c2

* commit '79f42608c265ecc22c09d239bdfd04dcaafca616':
  Deprecate shell-based UI Automator.

Change-Id: I9173d27b964f7ccf05b6f84c7e71a3fe4b3b7033

8 years agoMerge "Fixed issue where ListView checked state did not account for ListView header...
Michael Kwan [Tue, 24 May 2016 21:41:30 +0000 (21:41 +0000)]
Merge "Fixed issue where ListView checked state did not account for ListView header." into nyc-mr1-dev am: 02178609c6
am: 9fcefb4c1d

* commit '9fcefb4c1d8554df4c8c14337e875bb33042d12f':
  Fixed issue where ListView checked state did not account for ListView header.

Change-Id: I24a239d5faa0b8b0c00384268fb02a817ad771f3

8 years agoAdd check for \'.end-content-title\' to force the end of content section in an accord...
Amanda Kassay [Tue, 24 May 2016 21:41:26 +0000 (21:41 +0000)]
Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1
am: 38ffaa1c51

* commit '38ffaa1c51627cd3ccee2f45e1d06c2fdd4ed3ba':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: Ibbb2c1987b4afbb8e3d692b1f8ae66b364d81883

8 years agoMerge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb
Adam Lesinski [Tue, 24 May 2016 21:41:20 +0000 (21:41 +0000)]
Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb
am: 5e106dea45

* commit '5e106dea4545547f3f7c50dad30f792809659b96':
  Improve performance of LocaleList with Resources

Change-Id: I733cdad0b30069ac7830fa91ef0188dd0f0cfac9

8 years agoMerge "Report OTA time statistics" into nyc-dev
Tianjie Xu [Tue, 24 May 2016 21:41:05 +0000 (21:41 +0000)]
Merge "Report OTA time statistics" into nyc-dev
am: 86f97177e9

* commit '86f97177e959cb40229010b90f066fd602d6a06f':
  Report OTA time statistics

Change-Id: I941b48f287fe72dbb3e0f61ccdea33deab3c34c5

8 years agoMerge "Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into...
Android Build Merger (Role) [Tue, 24 May 2016 21:36:29 +0000 (21:36 +0000)]
Merge "Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a am: 2c5efb4827" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f...
Android Build Merger (Role) [Tue, 24 May 2016 21:36:21 +0000 (21:36 +0000)]
Merge "Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b am: 03174b8cca" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Deprecate shell-based UI Automator." into nyc-dev
Allen Hair [Tue, 24 May 2016 21:36:20 +0000 (21:36 +0000)]
Merge "Deprecate shell-based UI Automator." into nyc-dev
am: f298f4a7c7

* commit 'f298f4a7c779588821b744c7247fc896541cae57':
  Deprecate shell-based UI Automator.

Change-Id: I0f8f99ddc4dd1048a84ab9f6f7edc19d923c7a75

8 years agoMerge "Merge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19...
Android Build Merger (Role) [Tue, 24 May 2016 21:36:12 +0000 (21:36 +0000)]
Merge "Merge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19 am: 8a78cbc1fa" into nyc-mr1-dev-plus-aosp

8 years agoAdd check for \'.end-content-title\' to force the end of content section in an accord...
Amanda Kassay [Tue, 24 May 2016 21:36:08 +0000 (21:36 +0000)]
Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345
am: 0a6d5112f1

* commit '0a6d5112f1c0f0574ecf62b440541fca4736a706':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: Ic7898fd17a5b3ce47a3dc67364635e33436b97d2

8 years agoMerge "Improve performance of LocaleList with Resources" into nyc-dev
Adam Lesinski [Tue, 24 May 2016 21:35:56 +0000 (21:35 +0000)]
Merge "Improve performance of LocaleList with Resources" into nyc-dev
am: bb26248bbb

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: Ic43a26915a28d71a967eb038331a0f3c31bdfe8f

8 years agoMerge "Report OTA time statistics" into nyc-dev
Tianjie Xu [Tue, 24 May 2016 21:35:23 +0000 (21:35 +0000)]
Merge "Report OTA time statistics" into nyc-dev

8 years agoMerge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev...
Jean-Michel Trivi [Tue, 24 May 2016 21:35:19 +0000 (21:35 +0000)]
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a
am: 2c5efb4827

* commit '2c5efb4827a7ca8e9a5f55c1c1bed00f4e2b23da':

Change-Id: Iaa368df4f90474feae621b513183f0c6c0815213

8 years agoMerge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev...
Jean-Michel Trivi [Tue, 24 May 2016 21:35:17 +0000 (21:35 +0000)]
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a am: 30979c2c76
am: 1e34fb313b

* commit '1e34fb313b3aec0961f598265a13d444ba149766':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I09972d0abc1488ff324e9bca9750923cfa8f9e51

8 years agoMerge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b
Adrian Roos [Tue, 24 May 2016 21:35:16 +0000 (21:35 +0000)]
Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b
am: 03174b8cca

* commit '03174b8cca8bd100e2179201383eeeebd65bd224':

Change-Id: I0f77b1039a58ce6a36f96375ded48293b2c6487b

8 years agoMerge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b...
Adrian Roos [Tue, 24 May 2016 21:35:13 +0000 (21:35 +0000)]
Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b am: 6c4060c8fb
am: 3f9d2173fd

* commit '3f9d2173fd92391764c00fc0eb670d8daf2d2587':
  Keep notifications with active remote inputs

Change-Id: If7a5fcd5feb0a8d4a900a5d2a561fe529287c9ac

8 years agoMerge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19
Adrian Roos [Tue, 24 May 2016 21:35:12 +0000 (21:35 +0000)]
Merge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19
am: 8a78cbc1fa

* commit '8a78cbc1fa996a458759ff51fa8ceec2f2223270':

Change-Id: I11fd663bc6dda425fe3e4e74a64bd2a697aa8cb2

8 years agoMerge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19 am: 1b608...
Adrian Roos [Tue, 24 May 2016 21:35:08 +0000 (21:35 +0000)]
Merge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19 am: 1b608e20da
am: 0d6f7bd749

* commit '0d6f7bd7494be7674dfa06e02c8460943fe4ff20':
  Fix janky swiping with RemoteInputViews

Change-Id: I9ad7f0d98df027c227bfa4fa4e14126b2220b64d

8 years agoMerge "Fixed issue where ListView checked state did not account for ListView header...
Michael Kwan [Tue, 24 May 2016 21:35:07 +0000 (21:35 +0000)]
Merge "Fixed issue where ListView checked state did not account for ListView header." into nyc-mr1-dev
am: 02178609c6

* commit '02178609c69d395d7ddbae2db278e50572cceec3':
  Fixed issue where ListView checked state did not account for ListView header.

Change-Id: I6f5fd65a9632a2f262c2e7a807cae487c4d5c0bc

8 years agoMerge "Deprecate shell-based UI Automator." into nyc-dev
Allen Hair [Tue, 24 May 2016 21:34:53 +0000 (21:34 +0000)]
Merge "Deprecate shell-based UI Automator." into nyc-dev
am: f298f4a7c7

* commit 'f298f4a7c779588821b744c7247fc896541cae57':
  Deprecate shell-based UI Automator.

Change-Id: Iaea8d67bd6bf9f57b3033eaefcb103d9f2e022dd

8 years agoAdd check for \'.end-content-title\' to force the end of content section in an accord...
Amanda Kassay [Tue, 24 May 2016 21:34:51 +0000 (21:34 +0000)]
Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345
am: 0a6d5112f1

* commit '0a6d5112f1c0f0574ecf62b440541fca4736a706':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: I8e4e87f0db6d10b13586c1c6464e941953b5e74a

8 years agoMerge "Improve performance of LocaleList with Resources" into nyc-dev
Adam Lesinski [Tue, 24 May 2016 21:34:48 +0000 (21:34 +0000)]
Merge "Improve performance of LocaleList with Resources" into nyc-dev
am: bb26248bbb

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: I307b4a7c78ff04797fda041afa8106b082951bc9

8 years agoMerge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev...
Jean-Michel Trivi [Tue, 24 May 2016 21:31:14 +0000 (21:31 +0000)]
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a
am: 30979c2c76

* commit '30979c2c765a647b85e98691e517bb3d4d395668':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I250ba004e8389be3b98151f7173cf729a6c386d0

8 years agoMerge "Deprecate shell-based UI Automator." into nyc-dev
Allen Hair [Tue, 24 May 2016 21:29:44 +0000 (21:29 +0000)]
Merge "Deprecate shell-based UI Automator." into nyc-dev

8 years agoAdd check for \'.end-content-title\' to force the end of content section in an accord...
Amanda Kassay [Tue, 24 May 2016 21:28:50 +0000 (21:28 +0000)]
Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d
am: 5a00e9d345

* commit '5a00e9d3450e0baccc89a88e586f8ce558e14aac':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: I1d972ef1511ff8205ec54f1af7241db104ea976a

8 years agoMerge "Fixed issue where ListView checked state did not account for ListView header...
Michael Kwan [Tue, 24 May 2016 21:27:19 +0000 (21:27 +0000)]
Merge "Fixed issue where ListView checked state did not account for ListView header." into nyc-mr1-dev

8 years agoMerge "Improve performance of LocaleList with Resources" into nyc-dev
Adam Lesinski [Tue, 24 May 2016 21:25:41 +0000 (21:25 +0000)]
Merge "Improve performance of LocaleList with Resources" into nyc-dev

8 years agoMerge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
Jean-Michel Trivi [Tue, 24 May 2016 21:24:03 +0000 (21:24 +0000)]
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
am: 3a91a8417a

* commit '3a91a8417a9de03a2f8f276fcd2d67dc43315464':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I1211c2411d052762d95896c0e22661bd718c3039

8 years agoMerge "Keep notifications with active remote inputs" into nyc-dev
Adrian Roos [Tue, 24 May 2016 21:23:59 +0000 (21:23 +0000)]
Merge "Keep notifications with active remote inputs" into nyc-dev
am: 0444314f8b

* commit '0444314f8b0f77519c47b567f970cc95dd568f7f':
  Keep notifications with active remote inputs

Change-Id: I478f812b2a6d347cc689652448de46eb922b86a9

8 years agoMerge "Fix janky swiping with RemoteInputViews" into nyc-dev
Adrian Roos [Tue, 24 May 2016 21:23:54 +0000 (21:23 +0000)]
Merge "Fix janky swiping with RemoteInputViews" into nyc-dev
am: a9c0d3ff19

* commit 'a9c0d3ff19461b0384ac4a586cd67e2084193604':
  Fix janky swiping with RemoteInputViews

Change-Id: Ie462da81453bbd509ea3ae3c49fdedd611c98cbd

8 years agoAdd check for \'.end-content-title\' to force the end of content section in an accord...
Amanda Kassay [Tue, 24 May 2016 21:23:50 +0000 (21:23 +0000)]
Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697
am: e468c2380d

* commit 'e468c2380ddcc1a7c1f2fa3c9995ad999e9c0ca8':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: Ibb8848aed348e85fff5a47562212e88172557b0b

8 years agoMerge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b
Adrian Roos [Tue, 24 May 2016 21:23:44 +0000 (21:23 +0000)]
Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b
am: 6c4060c8fb

* commit '6c4060c8fba743ea02b2d470dbde5eb06de4b41b':
  Keep notifications with active remote inputs

Change-Id: I40fad56ffd168fdfd4f5729d0e530ce2c81b59e6

8 years agoMerge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19
Adrian Roos [Tue, 24 May 2016 21:23:39 +0000 (21:23 +0000)]
Merge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19
am: 1b608e20da

* commit '1b608e20da261d4698a139c522af1cd139e0e1c5':
  Fix janky swiping with RemoteInputViews

Change-Id: Ic721aec5281120482e8145dd237ed79d75ad6a12

8 years agoMerge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
Jean-Michel Trivi [Tue, 24 May 2016 21:23:29 +0000 (21:23 +0000)]
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
am: 3a91a8417a

* commit '3a91a8417a9de03a2f8f276fcd2d67dc43315464':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I5842a7067c383d30f610c72c3511a4dfeb90540c

8 years agoMerge "Children should have backgrounds" into nyc-dev am: 31e49b0964 am: 470c001355
Mady Mellor [Tue, 24 May 2016 21:23:09 +0000 (21:23 +0000)]
Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964 am: 470c001355
am: f916151173

* commit 'f9161511739ac6fac276223cfb793d52d2433385':

Change-Id: Ib7f50925398fecc2c451e5d1ab51ebb0230e94f7

8 years agoMerge "Keep notifications with active remote inputs" into nyc-dev
Adrian Roos [Tue, 24 May 2016 21:19:29 +0000 (21:19 +0000)]
Merge "Keep notifications with active remote inputs" into nyc-dev
am: 0444314f8b

* commit '0444314f8b0f77519c47b567f970cc95dd568f7f':
  Keep notifications with active remote inputs

Change-Id: If4701470bcce953058cb4126d4ce492c576ef807

8 years agoMerge "Children should have backgrounds" into nyc-dev am: 31e49b0964 am: 12021f5020
Mady Mellor [Tue, 24 May 2016 21:19:27 +0000 (21:19 +0000)]
Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964 am: 12021f5020
am: a016449a83

* commit 'a016449a83e5fcccf0d2364c1143e958b564394f':
  Children should have backgrounds

Change-Id: I17fe77a79aabeab43b790a010afd87855ff6a5ce

8 years agoMerge "Fix janky swiping with RemoteInputViews" into nyc-dev
Adrian Roos [Tue, 24 May 2016 21:19:26 +0000 (21:19 +0000)]
Merge "Fix janky swiping with RemoteInputViews" into nyc-dev
am: a9c0d3ff19

* commit 'a9c0d3ff19461b0384ac4a586cd67e2084193604':
  Fix janky swiping with RemoteInputViews

Change-Id: I3d89c5c0bcb4701335af0f18791e993a50501863

8 years agoMerge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev
Jean-Michel Trivi [Tue, 24 May 2016 21:17:48 +0000 (21:17 +0000)]
Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev

8 years agoMerge "Children should have backgrounds" into nyc-dev am: 31e49b0964
Mady Mellor [Tue, 24 May 2016 21:15:34 +0000 (21:15 +0000)]
Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964
am: 470c001355

* commit '470c001355894b92724901924188c2be7d53e90f':

Change-Id: I3af3c40c4d19c82afad6138b001383bcde778551

8 years agoMerge "Keep notifications with active remote inputs" into nyc-dev
Adrian Roos [Tue, 24 May 2016 21:13:29 +0000 (21:13 +0000)]
Merge "Keep notifications with active remote inputs" into nyc-dev

8 years agoMerge "Children should have backgrounds" into nyc-dev am: 31e49b0964
Mady Mellor [Tue, 24 May 2016 21:13:25 +0000 (21:13 +0000)]
Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964
am: 12021f5020

* commit '12021f5020a057b3c0be8643bf5a8a999f488732':
  Children should have backgrounds

Change-Id: I5343b9b9aa4fb6c5e1f343cf5f4927c44bd5489d

8 years agoMerge "Fix janky swiping with RemoteInputViews" into nyc-dev
Adrian Roos [Tue, 24 May 2016 21:13:20 +0000 (21:13 +0000)]
Merge "Fix janky swiping with RemoteInputViews" into nyc-dev

8 years agoAdd check for \'.end-content-title\' to force the end of content section in an accord...
Amanda Kassay [Tue, 24 May 2016 21:12:15 +0000 (21:12 +0000)]
Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.
am: 85b7df2697

* commit '85b7df26975997826a738a46ae4ab797941175ea':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: If25728a85efb5b0ed46e87c45916621d8ad1d9ab

8 years agoMerge "Children should have backgrounds" into nyc-dev
Mady Mellor [Tue, 24 May 2016 21:09:33 +0000 (21:09 +0000)]
Merge "Children should have backgrounds" into nyc-dev
am: 31e49b0964

* commit '31e49b0964cfba0b6b91e8ae67cbc04730098569':
  Children should have backgrounds

Change-Id: I4c123a7cf9efd38c46ff155a70f5b9c053e4df02

8 years agoMerge "Children should have backgrounds" into nyc-dev
Mady Mellor [Tue, 24 May 2016 21:08:17 +0000 (21:08 +0000)]
Merge "Children should have backgrounds" into nyc-dev
am: 31e49b0964

* commit '31e49b0964cfba0b6b91e8ae67cbc04730098569':
  Children should have backgrounds

Change-Id: I1f68467af9048b93631c33243f4a2dd2e67ccf81

8 years agoMerge "Load up-to-date thumbnail if the cached one is out of date."
Garfield Tan [Tue, 24 May 2016 21:03:32 +0000 (21:03 +0000)]
Merge "Load up-to-date thumbnail if the cached one is out of date."

8 years agoMerge "Children should have backgrounds" into nyc-dev
Mady Mellor [Tue, 24 May 2016 20:59:49 +0000 (20:59 +0000)]
Merge "Children should have backgrounds" into nyc-dev

8 years agoMerge "Merge "Add Content Description for Focusable Elements in TV Recents UI" into...
Sid Soundararajan [Tue, 24 May 2016 20:50:30 +0000 (20:50 +0000)]
Merge "Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev am: a95568b846 am: 2954f22bb5" into nyc-mr1-dev-plus-aosp
am: bf809fa984

* commit 'bf809fa98414016d04d97e0079663e3a09865f32':

Change-Id: I4c1d20ae069b7e64c757b768bad8bde4bef94f1f

8 years agoMerge "Add Content Description for Focusable Elements in TV Recents UI" into nyc...
Sid Soundararajan [Tue, 24 May 2016 20:50:26 +0000 (20:50 +0000)]
Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev am: a95568b846 am: 8b1dce7186
am: 48a6f454a3

* commit '48a6f454a337d99cd569a959d00f97734a667966':
  Add Content Description for Focusable Elements in TV Recents UI

Change-Id: I06671c6a88f9bbb3b0d5b4a31650e0f9f3e712b5

8 years agoMerge "Process user events from service lifecycle callbacks." into nyc-dev am: a44000...
Winson [Tue, 24 May 2016 20:37:08 +0000 (20:37 +0000)]
Merge "Process user events from service lifecycle callbacks." into nyc-dev am: a4400059a3 am: 8c43f6fe91
am: 3f69059aec

* commit '3f69059aecf166dad03ba1ada74620276c4b598c':

Change-Id: I0d5d7cad2885200cfb26910a8e8370d8f8c7f9ab

8 years agoMerge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 am: 26431282ec...
Winson Chung [Tue, 24 May 2016 20:37:04 +0000 (20:37 +0000)]
Merge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 am: 26431282ec" into nyc-mr1-dev-plus-aosp
am: 9c8953b910

* commit '9c8953b910f25d058cdaf37053c07ae0a40e1b14':
  Process user events from service lifecycle callbacks.

Change-Id: I4858fd5659c4b3fb231d50bbb1e93b012c4282c1

8 years agoMerge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f...
Selim Cinek [Tue, 24 May 2016 20:37:00 +0000 (20:37 +0000)]
Merge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9 am: f03a50c4cb" into nyc-mr1-dev-plus-aosp
am: f3ad723c42

* commit 'f3ad723c42a5d90b699dfbe88eab8ccc3c3bc317':

Change-Id: I37152c6de945de26ffc1829218aff1d617ea0007

8 years agoMerge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f...
Chih-Hung Hsieh [Tue, 24 May 2016 20:36:53 +0000 (20:36 +0000)]
Merge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp am: e60c649ada" into nyc-mr1-dev-plus-aosp
am: ce685d90a5

* commit 'ce685d90a53dd47c9c8d02a8ec5fd4fe59afd77e':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: I08ca821a4d6b9295efc1522c558f3449126ef5f3

8 years agoMerge "Merge "Add Content Description for Focusable Elements in TV Recents UI" into...
Android Build Merger (Role) [Tue, 24 May 2016 20:36:47 +0000 (20:36 +0000)]
Merge "Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev am: a95568b846 am: 2954f22bb5" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Add Content Description for Focusable Elements in TV Recents UI" into nyc...
Sid Soundararajan [Tue, 24 May 2016 20:36:15 +0000 (20:36 +0000)]
Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev am: a95568b846
am: 8b1dce7186

* commit '8b1dce71861960de1f9953688d6faa13c0a86774':
  Add Content Description for Focusable Elements in TV Recents UI

Change-Id: Idc52194b5d63a12c7e6289a3835f2337da685920

8 years agoMerge "Add Content Description for Focusable Elements in TV Recents UI" into nyc...
Sid Soundararajan [Tue, 24 May 2016 20:36:14 +0000 (20:36 +0000)]
Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev am: a95568b846
am: 2954f22bb5

* commit '2954f22bb5dec35a1f51ce71a458cafd07ce2e46':
  Add Content Description for Focusable Elements in TV Recents UI

Change-Id: Ibc036dbaa2a0d5139ed243b2f1fd0d3d2cd0f109

8 years agoMerge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev
Sid Soundararajan [Tue, 24 May 2016 20:30:42 +0000 (20:30 +0000)]
Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev
am: a95568b846

* commit 'a95568b84617e1c48e1eb6f505d58813f5227657':
  Add Content Description for Focusable Elements in TV Recents UI

Change-Id: I13991ffb3eec7e12a4e674523fe4259d90faad7e

8 years agoMerge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev
Sid Soundararajan [Tue, 24 May 2016 20:30:28 +0000 (20:30 +0000)]
Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev
am: a95568b846

* commit 'a95568b84617e1c48e1eb6f505d58813f5227657':
  Add Content Description for Focusable Elements in TV Recents UI

Change-Id: I1f2236d1d05b7e850d0a16248c8a4447909763ad

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738...
Selim Cinek [Tue, 24 May 2016 20:26:29 +0000 (20:26 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738 am: 40a6b1dbb5
am: a6954bc53c

* commit 'a6954bc53c7682c89f8f354bb019882e87b62bc0':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Ica13b23532b0d207d05068d8ecbd8c01f66006ee

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am...
Tony Mak [Tue, 24 May 2016 20:26:21 +0000 (20:26 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: 18b1826a8c
am: 74275b16d1

* commit '74275b16d1affa756246664dfc951878c616cfb5':

Change-Id: I1cae997343d5e492c6a1aab565c708d2f4192e18

8 years agoMerge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181...
Adarsh Fernando [Tue, 24 May 2016 20:26:13 +0000 (20:26 +0000)]
Merge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: fa6e151d5d" into nyc-mr1-dev-plus-aosp
am: 0fbfc4b689

* commit '0fbfc4b6895679fa20f810c88302aee10b6da656':

Change-Id: I4ae79004d47bd3e282f358dba14e9b2d0c5279dd

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am...
Tony Mak [Tue, 24 May 2016 20:26:03 +0000 (20:26 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: 5e08d12331
am: 3fbe5c0d34

* commit '3fbe5c0d34769ca0237a8bf7ea4c38ed1e4f8edd':
  Fix first notification of each app is not shown

Change-Id: I645d0ae0b2f55b72510921b9a2abeb71499a5a68

8 years agoAdd check for '.end-content-title' to force the end of content section in an accordio...
Amanda Kassay [Tue, 24 May 2016 20:19:33 +0000 (16:19 -0400)]
Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

b/28917925

Related CL (critique): cl/123138252

Staged:
https://android-dot-devsite.googleplex.com/preview/setup-sdk.html?hl=es

Change-Id: I4eb606c0205af2315896fc0587cc1c4c2502f282

8 years agoMerge "Process user events from service lifecycle callbacks." into nyc-dev am: a4400059a3
Winson Chung [Tue, 24 May 2016 20:25:45 +0000 (20:25 +0000)]
Merge "Process user events from service lifecycle callbacks." into nyc-dev am: a4400059a3
am: 8c43f6fe91

* commit '8c43f6fe915bc2d44adc188fed148cf885a33433':

Change-Id: Icfed40e881c97af3984a4b51dd2740248492dc16

8 years agoMerge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 am: 26431282ec...
Android Build Merger (Role) [Tue, 24 May 2016 20:21:55 +0000 (20:21 +0000)]
Merge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 am: 26431282ec" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f...
Android Build Merger (Role) [Tue, 24 May 2016 20:21:45 +0000 (20:21 +0000)]
Merge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9 am: f03a50c4cb" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f...
Android Build Merger (Role) [Tue, 24 May 2016 20:21:36 +0000 (20:21 +0000)]
Merge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp am: e60c649ada" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev
Sid Soundararajan [Tue, 24 May 2016 20:21:34 +0000 (20:21 +0000)]
Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev

8 years agoMerge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3
Winson Chung [Tue, 24 May 2016 20:21:05 +0000 (20:21 +0000)]
Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3
am: 26431282ec

* commit '26431282ec5a25b94114c8acff38ba6178bb2c31':
  Process user events from service lifecycle callbacks.

Change-Id: I51a1c243eb0dc8beebab0a19cd5c3636295c9ea8

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9
Selim Cinek [Tue, 24 May 2016 20:21:02 +0000 (20:21 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9
am: f03a50c4cb

* commit 'f03a50c4cb8b5e50a751dd7a8ac7bd80b27364e2':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Id73011f950e037af8a7eee7e6490777b150d6adc

8 years agoMerge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4...
Chih-Hung Hsieh [Tue, 24 May 2016 20:20:59 +0000 (20:20 +0000)]
Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp
am: e60c649ada

* commit 'e60c649adab7bbbbce1118d3598446973adf2f0b':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: Iaed05df438fd181694c71b842ecaed5b054352b6

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738
Tony Mak [Tue, 24 May 2016 20:20:58 +0000 (20:20 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738
am: 40a6b1dbb5

* commit '40a6b1dbb53fd4a8d499ee9ad0ba953137cfecec':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: I820cdd49b8bd04dd05fd18f2bf8456182ba6a725

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
Adarsh Fernando [Tue, 24 May 2016 20:20:53 +0000 (20:20 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
am: 18b1826a8c

* commit '18b1826a8c6e6a1026239478072bf7c725219dcf':

Change-Id: Idcd9c2cb66e11f88faab34363fc3a7e1cc5cbf7d

8 years agoMerge "Initialize device locked state during boot"
Xiaohui Chen [Tue, 24 May 2016 20:20:46 +0000 (20:20 +0000)]
Merge "Initialize device locked state during boot"

8 years agoMerge "Process user events from service lifecycle callbacks." into nyc-dev
Winson [Tue, 24 May 2016 20:20:23 +0000 (20:20 +0000)]
Merge "Process user events from service lifecycle callbacks." into nyc-dev
am: a4400059a3

* commit 'a4400059a307adfea00a2ae3726949c802d4e2ad':
  Process user events from service lifecycle callbacks.

Change-Id: I11a1e228ea22d0f35ab09bd4b0259c07c9b9bde1

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am...
Adarsh Fernando [Tue, 24 May 2016 20:20:17 +0000 (20:20 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: 8a7d7a26e2
am: 4cdc70b070

* commit '4cdc70b07062812498a28d07c9267e7f6f18cd25':
  Doc: delete old test_framework.png

Change-Id: I8577ceb2bde65f304accf05241002af286634a40

8 years agoMerge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181...
Android Build Merger (Role) [Tue, 24 May 2016 20:17:35 +0000 (20:17 +0000)]
Merge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: fa6e151d5d" into nyc-mr1-dev-plus-aosp

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
Adarsh Fernando [Tue, 24 May 2016 20:17:04 +0000 (20:17 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
am: fa6e151d5d

* commit 'fa6e151d5de39d1be03f57854ed7596d28856d75':

Change-Id: Idb465177f33205908f510421a3166de7fc35a580

8 years agoDoc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
Adarsh Fernando [Tue, 24 May 2016 20:16:34 +0000 (20:16 +0000)]
Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e
am: 5e08d12331

* commit '5e08d12331c53c6db708877b012187c245097bfc':
  Fix first notification of each app is not shown

Change-Id: I428894e3442eb90fed192cfd58b44353ab2b03fe

8 years agoMerge changes I7773ed3a,I73d97d9a into nyc-dev
Selim Cinek [Tue, 24 May 2016 20:16:16 +0000 (20:16 +0000)]
Merge changes I7773ed3a,I73d97d9a into nyc-dev
am: a4400059a3

* commit 'a4400059a307adfea00a2ae3726949c802d4e2ad':
  Process user events from service lifecycle callbacks.

Change-Id: Ia7436eba1886c9bd739cc3cda5029fd8caf0b109

8 years agoMerge changes I7773ed3a,I73d97d9a into nyc-dev
Selim Cinek [Tue, 24 May 2016 20:16:16 +0000 (20:16 +0000)]
Merge changes I7773ed3a,I73d97d9a into nyc-dev
am: c178f519b9

* commit 'c178f519b94b239aa02633dae7127e619f5b0aa6':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Id9b18a7cdd1ed97a06916e6a29b7294551c33acf

8 years agoMerge "Fix first notification of each app is not shown" into nyc-dev
Tony Mak [Tue, 24 May 2016 20:16:08 +0000 (20:16 +0000)]
Merge "Fix first notification of each app is not shown" into nyc-dev
am: ed353f1738

* commit 'ed353f173852551f0dc0b360512a9abc5c77c28e':
  Fix first notification of each app is not shown

Change-Id: Ib3702c334b7d41b75684720d36caaa62cc52f074