| commit | 14d533d9c4190d288a2067c144527052ad2bbce8 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Jan 16 14:01:30 2014 -0800 |
| committer | Alex Klyubin <klyubin@google.com> | Thu Jan 16 14:01:55 2014 -0800 |
| tree | df7fb83e00b3ffd8d9d31688289451142671cb62 | |
| parent | 5f703fb3545dd3f670e9e610e1f3bad75b941162 [diff] | |
| parent | 2b9e27eef83903151c888680a1c8938b33bb350b [diff] |
resolved conflicts for merge of 2b9e27ee to master Conflicts: tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java Change-Id: I44bb4b59ffe1b85dab22609d45179fa06f257adc