OSDN Git Service

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


Trivial merge