commit | c93e4352b56606ce0a5594205242d9ab42633c55 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Sat Jul 25 03:26:13 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 25 03:26:13 2015 +0000 |
tree | 7d4f49f8f0daf365a7845a9c35ce2cac5cb3e18a | |
parent | d7d58aef007743e3bd7d2e9975ab3f3c4830ab0a [diff] | |
parent | 635d4ca2225abdf05ed8da639ea87c01f59bf054 [diff] |
am 437d6982: resolved conflicts for merge of 038b76c2 to mnc-dr-dev-plus-aosp * commit '437d698257ab407790fed3e293fe6488fd0c5a70': Turn on warnings for libcutils, fix a bug.