OSDN Git Service

am 2d5c9de6: am 6863fac2: (-s ours) am 8c9136ef: Merge "[Fingerprint] Shrink fingerpr...
authorMaurice Lam <yukl@google.com>
Thu, 27 Aug 2015 20:20:45 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:20:45 +0000 (20:20 +0000)
* commit '2d5c9de6b54cbc6e63071dbac874cec32e989340':


Trivial merge