tree 754c98f0002bcba3b1227143bedabeef72c9d6eb
parent 08a38b68e9979dd855026394ccc67f7eed0dbd85
parent a083ef9a7b882a249928ed928adf6af61a525e37
author Colin Cross <ccross@google.com> 1437679547 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437679547 +0000

am a083ef9a: am bbcc914b: am 01efd7e8: Merge "Use build_number from file"

* commit 'a083ef9a7b882a249928ed928adf6af61a525e37':
  Use build_number from file