OSDN Git Service

am af93f558: am a914a0d7: am 08842ae7: am 12c909b2: resolved conflicts for merge...
authorYing Wang <wangying@google.com>
Mon, 12 May 2014 23:27:42 +0000 (23:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:27:42 +0000 (23:27 +0000)
* commit 'af93f5585e2301b1828874d1abef94e521119379':


Trivial merge