OSDN Git Service

am 1203ee33: (-s ours) am 07d188ad: Merge "Fix lint errors."
authorLorenzo Colitti <lorenzo@google.com>
Thu, 27 Aug 2015 11:17:13 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:13 +0000 (11:17 +0000)
* commit '1203ee33a1743648126f71aa340608458e774204':


Trivial merge