OSDN Git Service

am da67719b: (-s ours) am f7b3f37d: am 364c8830: am 23df6752: Merge "Workaround for...
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 'da67719ba3989288ddfa7530530d40720d8a4174':


Trivial merge