| commit | ca424c67f3deeb34a870e37a5743f66091961112 | [log] [tgz] |
|---|---|---|
| author | Jan-Willem Maarse <maarse@google.com> | Tue Jul 15 20:38:34 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 15 20:35:01 2014 +0000 |
| tree | 8a1f39c5d925249142092afec65d5f2573480f66 | |
| parent | 4224758a546aafee4f6b6ce932bfb0d7586d8521 [diff] | |
| parent | 2ff91c46fa6f1b84fb08b6f31499934d30d8a91d [diff] |
Merge "Allow custom content to lock the workspace" into ub-now-master