commit | 7defcc859051024cfaec31a2d4b0c1aed42695a4 | [log] [tgz] |
---|---|---|
author | Paul Jensen <pauljensen@google.com> | Tue Sep 23 12:08:22 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 23 12:08:22 2014 +0000 |
tree | 6d4b344e61cb8d1b6c78bd0ba20edf9ef4c06a70 | |
parent | d41c62041cd7ea4fbc68bc857c611c98e1d7de52 [diff] | |
parent | 74971c75dcdfacdf49f110c2104f20e704bffdcb [diff] |
am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev * commit '1c637c5fef678a82fd1f2c380d41ed6ebcb5bf2e': Remove needless locking of mRulesLock that caused deadlocks.