OSDN Git Service

am 69716b54: (-s ours) am f777d24c: am 595bcb4c: (-s ours) DO NOT MERGE Do not set...
authorMatthew Xie <mattx@google.com>
Sat, 25 Oct 2014 19:54:52 +0000 (19:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Oct 2014 19:54:52 +0000 (19:54 +0000)
* commit '69716b54b9faf23709b185a13bca2955bff62fbf':


Trivial merge