OSDN Git Service

am 7e0c4215: (-s ours) am bb69c0d8: (-s ours) am 572bdaa4: (-s ours) am f0d79e57...
authorBaligh Uddin <baligh@google.com>
Thu, 23 Oct 2014 17:30:54 +0000 (17:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 17:30:54 +0000 (17:30 +0000)
* commit '7e0c421585928f7de9336f6af45000b2e3ca9ddc':


Trivial merge