diff options
| author | Hansong Zhang <hsz@google.com> | 2019-02-01 17:45:30 -0800 |
|---|---|---|
| committer | Tim Schumacher <timschumi@gmx.de> | 2019-07-07 14:49:22 +0200 |
| commit | ad7555c9d783be7e360de0edf114f3da8da70b5f (patch) | |
| tree | 30b1de1681c94d68c594b8f6bb8f1c2ea8ec71f1 /osi/Android.mk | |
| parent | 3d34ee18a6b5e16ddf77157103a1c3cc5a777d3b (diff) | |
| download | android_system_bt-cm-13.0.tar.gz android_system_bt-cm-13.0.tar.bz2 android_system_bt-cm-13.0.zip | |
resolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-devHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004cm-13.0
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id658b3485fdc0025bc44850be9f23bb2d2146d9b
(cherry picked from commit 6c0f22f324ed0bdf9dea3e803e5ee6176d03fdb4)
Diffstat (limited to 'osi/Android.mk')
0 files changed, 0 insertions, 0 deletions