Jeff Sharkey 53cfa2cc8c resolve merge conflicts of 6af9cdf137 to master ...

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

2018-09-12 09:41:26 -06:00

..

aapt

Merge "Convert aapt to Soong" am: 7bd321ca25 am: 9f5e3e822c

2018-08-29 20:02:39 -07:00

aapt2

Merge "AAPT2: Fix dump apk format"

2018-08-31 00:01:40 +00:00

aosp

Tweaks to AOSP upload hook logic.

2018-09-11 12:14:48 -06:00

apilint

Handle new current.txt format.

2018-07-17 13:59:04 -06:00

bit

…

fonts

Remove requirement for kiss emoji should have gender

2018-07-19 17:12:02 +00:00

hiddenapi

Revert "Check in P dark greylist, use it for hidden API list generation"

2018-09-11 11:43:07 +01:00

incident_report

Merge "Fix a 'memory leak'" am: 38e7338d92

2018-06-05 19:56:22 -07:00

incident_section_gen

Add kernel version to incident report

2018-06-22 16:51:40 -07:00

localedata

…

locked_region_code_injection

…

obbtool

…

orientationplot

…

preload

…

preload2

…

processors/unsupportedappusage

Fix compilation when targeting OpenJDK 9.

2018-09-06 17:33:57 +01:00

sdkparcelables

…

split-select

…

stats_log_api_gen

allow use of atom definition outside of atoms.proto in pulled atoms

2018-09-10 18:26:33 -07:00

streaming_proto

…

stringslint

More string lint checks.

2018-06-06 09:51:01 -06:00

validatekeymaps

Refactor String8 to std::string calls

2018-07-11 09:56:43 +01:00

velocityplot

…

aidl

…

genprotos.sh

Work around b/70221552

2018-08-08 09:52:51 -07:00