OSDN Git Service

am 9fb17011: (-s ours) am 867c6364: am 4e90efbc: am c502bc9d: Correct sample factor...
authorDoris Liu <tianliu@google.com>
Wed, 30 Apr 2014 18:14:42 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:42 +0000 (18:14 +0000)
* commit '9fb17011a40e71543775b3a951a4d983da9a125c':


Trivial merge