commit | 906ee0d75770028167cc504af412846f593246af | [log] [tgz] |
---|---|---|
author | Andreas Gampe <agampe@google.com> | Tue Nov 25 20:03:41 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 20:03:41 2014 +0000 |
tree | 9c79734b2131ca300486df306ecf55c0d39b9849 | |
parent | 0f41d611290128273eb18d6fea4be7f0922c8a4b [diff] | |
parent | 38c3386a6cd44789f540fb9700c284345e7269e3 [diff] |
am 38c3386a: resolved conflicts for merge of 03be4928 to lmp-mr1-dev-plus-aosp * commit '38c3386a6cd44789f540fb9700c284345e7269e3': Healthd: Remove unused variables