OSDN Git Service

am 08339ae8: (-s ours) am eba2ebbd: am 52fab3a0: am 3179f6a4: Allow scaling beyond...
authorDoris Liu <tianliu@google.com>
Wed, 30 Apr 2014 18:14:43 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:43 +0000 (18:14 +0000)
* commit '08339ae81ea680fc08244c873127a8aaa9ecfe8a':


Trivial merge