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)
commit5f186eda713c7b6a4cae7f1e4f4ff2fce251b6fe
treea4db20500e7130fd7856f1fff2d10d10c5234160
parentdd9e65c9c4822860f41a41b59f43955e354e035e
parent1203ee33a1743648126f71aa340608458e774204
am 1203ee33: (-s ours) am 07d188ad: Merge "Fix lint errors."

* commit '1203ee33a1743648126f71aa340608458e774204':