OSDN Git Service

am e7ef368b: (-s ours) am 42efa85d: Merge "Use build number from file"
authorColin Cross <ccross@google.com>
Thu, 27 Aug 2015 11:19:23 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:23 +0000 (11:19 +0000)
* commit 'e7ef368b09562513baa070c014c68a9f11d6a782':


Trivial merge