OSDN Git Service

am 45385a9f: (-s ours) am c4810a33: am 148b65b0: am 1f69e36b: A workaround for crash...
authorDoris Liu <tianliu@google.com>
Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)
* commit '45385a9f3225e8e1504aa0fa4cefd84a5bc77104':


Trivial merge