diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-20 20:36:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 20:36:34 +0000 |
| commit | 7cd52895ec3e014c1097852725ba68646c1d6665 (patch) | |
| tree | 436d4e389044465fe4235ebf22d4283e7f5e646e | |
| parent | 52bc363cf3a7de8431cfbb370f0fd3adeecaed52 (diff) | |
| parent | 5035faba9a28f988291c4ff3d3cbf64d828f3f5a (diff) | |
| download | frameworks_base-7cd52895ec3e014c1097852725ba68646c1d6665.zip frameworks_base-7cd52895ec3e014c1097852725ba68646c1d6665.tar.gz frameworks_base-7cd52895ec3e014c1097852725ba68646c1d6665.tar.bz2 | |
am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev
* commit '5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
Verify certificates
0 files changed, 0 insertions, 0 deletions