From: Christopher Wiley <wiley@google.com>
Date: Tue, 16 Feb 2016 16:50:01 +0000 (+0000)
Subject: Merge "Replace AppOpsManager locking with std::lock_guard"
X-Git-Tag: android-x86-8.1-r1~377^2~769^2~11^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d3a9228d1d;p=android-x86%2Fframeworks-native.git

Merge "Replace AppOpsManager locking with std::lock_guard"
---

d3a9228d1d2388f21b4e8013cf2fad7b4c91ace7