Joshua Mccloskey 143e3dfdfc Merge "Updated string." into qt-r1-dev ...

am: c746066221

Change-Id: I0c7a7ba23fc45b9af828cfbd87a0d6c4ead18dc2

2019-06-12 18:29:24 -07:00

..

assets

…

res

Merge "Updated string." into qt-r1-dev

2019-06-12 18:29:24 -07:00

Android.bp

…

AndroidManifest.xml

Merge "Changed comments to match real protection level" into qt-dev

2019-05-29 16:01:12 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

TEST_MAPPING

…