tree c0772aabf7cb6c94d21d201bfa35d0a169af5fab
parent 69ad4a1565170c6c6497e4d0585f991ccfbfa4cd
parent caffa7789c80108c4f2c230c0a26bd8d8a549ec8
author Benjamin Franz <bfranz@google.com> 1519308513 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1519308513 +0000

Merge "Update lock task features name and javadoc"