Ryan Prichard 3b827e107a Merge "Categorize [anon:stack_and_tls:{}] as stack memory" into stage-aosp-master am: 4657a1648c ...

am: 6c05510d86

Change-Id: Ibe8bb89f39082f73f3a4e7bdcf34ebdf5dc2f2b6

2019-07-23 13:33:03 -07:00

..

java

Merge "docs: Fixed link in setCurrentTab() description" into qt-dev am: 2839f24e64

2019-07-22 15:37:02 -07:00

jni

Merge "Categorize [anon:stack_and_tls:{}] as stack memory" into stage-aosp-master am: 4657a1648c

2019-07-23 13:33:03 -07:00

proto

Merge "Add gesture touch counts" into qt-r1-dev

2019-07-02 11:41:05 -07:00

res

Merge "Fix permission javadoc about whitelisting." into qt-dev am: 4918e711d3

2019-07-23 11:05:31 -07:00

tests

resolve merge conflicts of 9acd72c60b to stage-aosp-master

2019-07-22 09:29:24 +00:00

xsd

…