OSDN Git Service

am 557e992b: (-s ours) am fe6dd2a7: service: Rename Uuid to UUID
authorArman Uguray <armansito@google.com>
Thu, 27 Aug 2015 10:55:37 +0000 (10:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:55:37 +0000 (10:55 +0000)
* commit '557e992b13b0f393fedc55c316af819d594638c6':


Trivial merge