OSDN Git Service

am 356868f8: am 7336be05: (-s ours) am f7286a26: Merge "Move tzdata scripts from...
authorNeil Fuller <nfuller@google.com>
Thu, 27 Aug 2015 14:17:04 +0000 (14:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:17:04 +0000 (14:17 +0000)
* commit '356868f8ac4ce530a147fe17947592c43571eeca':


Trivial merge