Nicolas Geoffray 2db76a079c resolve merge conflicts of 0fc2ec4e51 to master ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I393649fb7e6357b0190a55626aeb9ce4d21785a3

2018-05-10 22:04:17 +01:00

..

boot-image-profile.txt

Synchronize stack position and size update for split screen

2018-04-10 18:11:19 -07:00

copyright-header

…

dirty-image-objects

…

generate-preloaded-classes.sh

…

hiddenapi-force-blacklist.txt

Manualy blacklist certain hidden APIs

2018-05-09 09:33:42 +01:00

hiddenapi-light-greylist.txt

resolve merge conflicts of 0fc2ec4e51 to master

2018-05-10 22:04:17 +01:00

hiddenapi-p-light-greylist.txt

Merge "Bluetooth: Update grey list to match hidden API change" am: 97047fd725

2018-05-09 18:38:14 -07:00

hiddenapi-vendor-list.txt

Populate hidden API light greylist for AOSP

2018-05-08 12:50:22 +01:00

preloaded-classes

Rename HardwareLayer -> TextureLayer

2018-02-21 15:55:58 -08:00

preloaded-classes-blacklist

…

preloaded-classes-extra

…