OSDN Git Service

am 537b6549: (-s ours) am ff23e760: am 46335a65: (-s ours) am 8c49ad68: am 24bbd72d...
authorJP Abgrall <jpa@google.com>
Mon, 12 May 2014 23:27:50 +0000 (23:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:27:50 +0000 (23:27 +0000)
* commit '537b654986afb1eed366d9384e0d77cc01e1eaca':


Trivial merge