diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-20 11:11:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 11:11:16 -0700 |
| commit | c53ad4cd807e74897ba2d7b799cb8ff6824b34e8 (patch) | |
| tree | b8d11e3e27f5d67bcf16e26751a4d9798f41dc05 /policy | |
| parent | c8868db2a025a97e439f8a9adde565c9c83f2204 (diff) | |
| parent | 072e1da26e80adb4009d063428c2ef8fb65c3d6c (diff) | |
| download | frameworks_base-c53ad4cd807e74897ba2d7b799cb8ff6824b34e8.zip frameworks_base-c53ad4cd807e74897ba2d7b799cb8ff6824b34e8.tar.gz frameworks_base-c53ad4cd807e74897ba2d7b799cb8ff6824b34e8.tar.bz2 | |
am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '072e1da26e80adb4009d063428c2ef8fb65c3d6c':
Verify certificates
Diffstat (limited to 'policy')
0 files changed, 0 insertions, 0 deletions