tree f1af9fed6b62c1d98f0501e05bd822256f2a730b
parent 82b3f67711246ad5beaf7702ce16e9d433406d1e
parent cc6366dde1776d40ab58f2475c4e1f8993253d7a
author Wale Ogunwale <ogunwale@google.com> 1435601574 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435601586 +0000

Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev