OSDN Git Service

am c3bb004e: (-s ours) am d3316978: am 33120140: am c937ab7f: Merge "Fix for mis...
authorDoris Liu <tianliu@google.com>
Wed, 30 Apr 2014 18:14:48 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:48 +0000 (18:14 +0000)
* commit 'c3bb004e141911ca30b0fb717737eba978d4bcd5':


Trivial merge