OSDN Git Service

am 33fd2fd8: (-s ours) am 6b0fd1f5: am 8fa9c2b5: am f1582c9c: Adjust the position...
authorAngus Kong <shkong@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 '33fd2fd8f4f5772cd30a6eff44d39c920f9e59ae':


Trivial merge