OSDN Git Service

am beefce58: am 8d4562a1: resolved conflicts for merge of 0a694f4c to master
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:30:42 +0000 (23:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:30:42 +0000 (23:30 +0000)
* commit 'beefce58dc9e1987143391634c09249d478bd598':


Trivial merge