Neil Fuller a76674f153 resolve merge conflicts of fe9b32e4be to qt-dev-plus-aosp ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: Merge conflict resolution for approved change
Change-Id: I39bda8417f709f86b5b389a75ff34df8a28a3d8d

2019-04-11 18:09:18 +00:00

..

java/com/android/server/backup

resolve merge conflicts of fe9b32e4be to qt-dev-plus-aosp

2019-04-11 18:09:18 +00:00

Android.bp

Convert services to Android.bp

2017-12-08 21:00:15 +00:00

OWNERS

Update B&R owners

2018-11-29 15:55:12 +00:00