tree 46cc7450f6cf65fc3dc0d6044da55636500197f8
parent 3987efa998a9bfbf148f83b286bfc3aeae62d87c
parent 50f6cb42218fd50ed2532884d1212e1c9a74c7b2
author Zhihai Xu <zhihaixu@google.com> 1384554638 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1384554639 +0000

Merge "remove a read lock to work around a platform deadlock problem." into klp-dev