diff options
author | Mark Salyzyn <salyzyn@google.com> | 2015-02-11 02:48:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 02:48:04 +0000 |
commit | ee632f734a5908d98de3deb2aad303d267c2d273 (patch) | |
tree | a8daa84035223907e1c5b59313bbb9c51f5a04fa /adf | |
parent | 85c0ab080240d953d962113054c97b753faa25d1 (diff) | |
parent | 8a5198a1505a4dc7d4722bb58a6eb809b0dd5d2c (diff) | |
download | system_core-ee632f734a5908d98de3deb2aad303d267c2d273.zip system_core-ee632f734a5908d98de3deb2aad303d267c2d273.tar.gz system_core-ee632f734a5908d98de3deb2aad303d267c2d273.tar.bz2 |
am 8a5198a1: am fd867303: Merge changes I420b5b8a,Ica23fe41
* commit '8a5198a1505a4dc7d4722bb58a6eb809b0dd5d2c':
log.h: wrap android_testLog around __android_log_is_loggable
log.h: deprecate CONDITION
Diffstat (limited to 'adf')
0 files changed, 0 insertions, 0 deletions