tree 05132c8ec9da9cdd9c03cb6ec919b1e2e9e9e79d
parent 33829b62bd09d5d634d6f137d38e06998abd8832
parent be69cc8ed86b7f22e7e4cf0c5a1500f45993075f
author Michael Jurka <mikejurka@google.com> 1310164817 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1310164817 -0700

Merge "Remove unnecessary lock"