OSDN Git Service

am edf2b787: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder.
authorJiawen Chen <jiawen@google.com>
Tue, 16 Sep 2014 15:21:30 +0000 (15:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 15:21:30 +0000 (15:21 +0000)
* commit 'edf2b787e94d7b9af0aee07412da0925e9515082':


Trivial merge