diff options
| author | Colin Cross <ccross@android.com> | 2013-06-24 17:22:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-24 17:22:56 -0700 |
| commit | b1e3bb2798bb6002b186081d9b0234bdfa432a14 (patch) | |
| tree | 56ba9ef61c85eb2f591b634f6b7eef4bb56c736b /include/mincrypt/sha.h | |
| parent | 372d668a279934ff3b2ec2f07a76fe2f351789d5 (diff) | |
| parent | b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a (diff) | |
| download | system_core-b1e3bb2798bb6002b186081d9b0234bdfa432a14.zip system_core-b1e3bb2798bb6002b186081d9b0234bdfa432a14.tar.gz system_core-b1e3bb2798bb6002b186081d9b0234bdfa432a14.tar.bz2 | |
am b1a9f8cf: resolved conflicts for merge of b6c60285 to stage-aosp-master
* commit 'b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a':
init: move initial property area allocation into bionic
property_service: make /dev/__properties__ readable
Diffstat (limited to 'include/mincrypt/sha.h')
0 files changed, 0 insertions, 0 deletions