tree 318a8e40f3e195524ddca50bbf31819eacbe7dd7
parent 9c7abaf86d1d0aa82afe7d8a3d02ecbebaab1403
parent a74afb644d140f2654e0042bba9be1eb329009f3
author Treehugger Robot <treehugger-gerrit@google.com> 1655309956 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655309956 +0000

Merge "PDL: tell ‘diff’ to output a colored diff" am: f263f85337 am: a74afb644d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2127434

Change-Id: I3e60f05a793f54e1be89545352860ccdd595100a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>