diff options
| author | Christopher Tate <ctate@google.com> | 2014-06-12 18:37:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 18:37:28 +0000 |
| commit | 93e9e7208e0de349a9592ac59153d6b06c202fe6 (patch) | |
| tree | d9a55ebdddd445da53e509c2872e1238abcd5208 /core/java/android/app/ActivityView.java | |
| parent | 02a9c359a1a6e1175cdd2d560f97be9cdb816a0e (diff) | |
| parent | f9fcfaae78afb0bc3e6a0716ad1d5fe3561bb81e (diff) | |
| download | frameworks_base-93e9e7208e0de349a9592ac59153d6b06c202fe6.zip frameworks_base-93e9e7208e0de349a9592ac59153d6b06c202fe6.tar.gz frameworks_base-93e9e7208e0de349a9592ac59153d6b06c202fe6.tar.bz2 | |
am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev
* commit 'ba6e8ae5d2a364799fd6bc84179e33b6731e574b':
Relax duplicate-permission-definition constraints slightly
Diffstat (limited to 'core/java/android/app/ActivityView.java')
0 files changed, 0 insertions, 0 deletions