OSDN Git Service

am a78b25f8: (-s ours) DO NOT MERGE
authorWinson Chung <winsonc@google.com>
Tue, 22 Oct 2013 09:47:40 +0000 (02:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Oct 2013 09:47:40 +0000 (02:47 -0700)
* commit 'a78b25f89de49b68a6dd7ddef5aaefe7919f3698':
  DO NOT MERGE


Trivial merge