| commit | f9fcfaae78afb0bc3e6a0716ad1d5fe3561bb81e | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Jun 11 22:44:31 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 11 08:41:11 2014 +0000 |
| tree | 71cba563814d3bbdde4afdf958f7eed6a469779b | |
| parent | 91b7d2b4fb2b2608477f3e7dbfb10f6cb3cd6b85 [diff] | |
| parent | b8c0383b0c00ed372ab92d3d0a5095c352d3e642 [diff] |
Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev