OSDN Git Service

am 39ce8333: (-s ours) am e8cb214b: am 0537d4f7: Merge "Increase ROI size to 1/8...
authorDoris Liu <tianliu@google.com>
Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)
* commit '39ce8333a33269e0ae59f01c3249cd6132fe1387':


Trivial merge