From: Colin Cross <ccross@google.com>
Date: Thu, 23 Jul 2015 19:01:41 +0000 (+0000)
Subject: am 42efa85d: Merge "Use build number from file"
X-Git-Tag: android-x86-7.1-r1~25^2~4^2~8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e7ef368b;p=android-x86%2Fpackages-apps-Camera2.git

am 42efa85d: Merge "Use build number from file"

* commit '42efa85dc19e6c105012d67e7a331ec0b64609e4':
  Use build number from file
---

e7ef368b09562513baa070c014c68a9f11d6a782