OSDN Git Service

am 9e8b5289: resolved conflicts for merge of 07c9557f to lmp-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Fri, 12 Sep 2014 19:28:16 +0000 (19:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Sep 2014 19:28:16 +0000 (19:28 +0000)
commit8b2a86a7f9bad31ecb827277bae5bf3a36238df9
tree09b5928242616b629107c5bc13b1da6a19d5d103
parentd898618914a8c91ae059fa04a160bcdf6559cfd5
parent9e8b528926506b3fa9ca7df52fef5f56ec6149c7
am 9e8b5289: resolved conflicts for merge of 07c9557f to lmp-dev-plus-aosp

* commit '9e8b528926506b3fa9ca7df52fef5f56ec6149c7':
  Fix warnings on unused variables and parameters.