tree 5f14da84a73e9e8b33d6bb137602e7c1da0a66e5
parent 017346d9d785e7b9c2886be49f28bfbe7b6bba9e
parent 55e4056aca7741701b3a1273b5f2856efb8a8bce
author Pavlin Radoslavov <pavlin@google.com> 1496326045 +0000
committer android-build-merger <android-build-merger@google.com> 1496326045 +0000

Merge "Add mutex-based protection mechanism to the HFP JNI layer" am: 984b96f1ce
am: 55e4056aca

Change-Id: I636efa280cfd99e527a6d1c63e471ecce4096d2e