tree 8a1f39c5d925249142092afec65d5f2573480f66
parent 4224758a546aafee4f6b6ce932bfb0d7586d8521
parent 2ff91c46fa6f1b84fb08b6f31499934d30d8a91d
author Jan-Willem Maarse <maarse@google.com> 1405456714 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1405456501 +0000

Merge "Allow custom content to lock the workspace" into ub-now-master