Nate Myren e612997b53 Merge "Add attribution info to start callbacks" into sc-dev am: 5d97f29218 am: 9d1a9399b8 ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15446590

Change-Id: Ib6fedf0b38bd88c3f6cd0aef6efa9529f17aaa44

2021-08-03 20:18:59 +00:00

..

api

Merge "Do not draw icon background if it shouldn't be seen" into sc-dev am: ee08a68fd4

2021-07-29 19:02:27 +00:00

java

Merge "Add attribution info to start callbacks" into sc-dev am: 5d97f29218 am: 9d1a9399b8

2021-08-03 20:18:59 +00:00

jni

Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev am: 40ddf958e6 am: 67ebbffe5f

2021-08-03 00:08:58 +00:00

proto

Merge "Add statsd logs for Sensor Privacy." into sc-dev am: cd40c7406f am: a79482b0f5

2021-07-08 17:39:34 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2021-08-02 23:11:24 +00:00

sysprop

…

tests

Merge "Sending TaskFragment token to client for the launching activity" into sc-v2-dev am: 3acc328b12

2021-08-03 02:43:39 +00:00

xsd

…

TEST_MAPPING

…