OSDN Git Service

am 42694ac4: (-s ours) am 2ae69122: am bc7ecede: am d70f0fb6: Add fling support in...
authorDoris Liu <tianliu@google.com>
Wed, 30 Apr 2014 18:14:45 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:45 +0000 (18:14 +0000)
* commit '42694ac4d55d28cf09e98a12f14eb66047681121':


Trivial merge