tree ac75ef8d412226494c783ad2b77aab939694dc8b
parent 30fd78e27294cd7104f6589ab10f3f3dd1e65fcc
parent 074b8b7cf19d128f16e0de12bc2fc58e7438ec37
author Jeff Brown <jeffbrown@google.com> 1351809752 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351809753 -0700

Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev