diff options
| author | Kenny Root <kroot@google.com> | 2014-11-03 18:40:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-03 18:40:55 +0000 |
| commit | d00ced983ee235f72a9261fd967309a2638dde05 (patch) | |
| tree | 586467b5d780f1844b1936b4ba98bf84b0b6cf40 /libs/androidfw/BackupData.cpp | |
| parent | 10ac55ba4f0beed608b310c473bb052cbcdf19c1 (diff) | |
| parent | b0cb07348e6320ce51d0e8b88d240ecf834850d1 (diff) | |
am b0cb0734: Merge "Track change to Conscrypt"
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
Track change to Conscrypt
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions