Suren Baghdasaryan e460e803c8 resolve merge conflicts of cc628869ff to master ...

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

2019-12-19 15:46:20 -08:00

..

android

Merge "Add R scoped storage app-ops"

2019-12-19 22:56:54 +00:00

com

resolve merge conflicts of cc628869ff to master

2019-12-19 15:46:20 -08:00

org

…

Android.bp

Add AIDL interface and puller implementation for automotive devices.

2019-12-02 13:08:13 -08:00

jarjar-rules.txt

…

overview.html

…