| commit | 93e9e7208e0de349a9592ac59153d6b06c202fe6 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Thu Jun 12 18:37:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 12 18:37:28 2014 +0000 |
| tree | d9a55ebdddd445da53e509c2872e1238abcd5208 | |
| parent | 02a9c359a1a6e1175cdd2d560f97be9cdb816a0e [diff] | |
| parent | f9fcfaae78afb0bc3e6a0716ad1d5fe3561bb81e [diff] |
am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev * commit 'ba6e8ae5d2a364799fd6bc84179e33b6731e574b': Relax duplicate-permission-definition constraints slightly