tree eb189f6d6a03aeb88648c17458c38ab372a481f4
parent 9a888b9be1085200ebd16a5aa0ff761e5a0a739f
parent 48aacba761527a529c2b668c8151c7f98ff70524
author Jason Monk <jmonk@google.com> 1408369021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408163538 +0000

Merge "Fixes to lock task API from API review" into lmp-dev