OSDN Git Service

am 09030300: (-s ours) am 69716b54: (-s ours) am f777d24c: am 595bcb4c: (-s ours...
authorMatthew Xie <mattx@google.com>
Sun, 26 Oct 2014 00:49:58 +0000 (00:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 26 Oct 2014 00:49:58 +0000 (00:49 +0000)
* commit '09030300acb73a33a9e3e0ac3908b0e52eae4f57':


Trivial merge