diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-03 13:01:09 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-04-03 13:01:09 -0700 |
| commit | dbcec13d64d7e6e8d4e5a867c1ca8b78951ed217 (patch) | |
| tree | 7cbb65edf7b1ccad05045523d0ed0a3bacb8dd6c /tests/permission | |
| parent | ecf2b4f550c329db8d12a6be91ac9a6b2b0c7432 (diff) | |
| parent | b068f162a4670287aa66d6b193c84ccd01e3417e (diff) | |
| download | frameworks_base-dbcec13d64d7e6e8d4e5a867c1ca8b78951ed217.zip frameworks_base-dbcec13d64d7e6e8d4e5a867c1ca8b78951ed217.tar.gz frameworks_base-dbcec13d64d7e6e8d4e5a867c1ca8b78951ed217.tar.bz2 | |
resolved conflicts for merge of b068f162 to master
Change-Id: I5bc234e1da047880d3437a861ff93474a9797e18
Diffstat (limited to 'tests/permission')
0 files changed, 0 insertions, 0 deletions