OSDN Git Service

am aa409401: am e7ef368b: (-s ours) am 42efa85d: Merge "Use build number from file"
authorColin Cross <ccross@google.com>
Thu, 27 Aug 2015 14:41:02 +0000 (14:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:41:02 +0000 (14:41 +0000)
commit444c685f03f4d7d0ca3411205b65ed8996a93620
tree320c9ee3b5b6483992abba889a5f0240886293ab
parentc3a9fae9ca756ec1c16782b6cb5f34c0e8deb3ee
parentaa4094010bc85d8db9cd7c2f3594bfdda2c69d61
am aa409401: am e7ef368b: (-s ours) am 42efa85d: Merge "Use build number from file"

* commit 'aa4094010bc85d8db9cd7c2f3594bfdda2c69d61':