tree 3a2a5364d433e38268628870695d212bc7f9d47b
parent a6355cbc9b705704b8d5db0fcba4fe5b9a796248
parent 90b8d087e61a4d713fb8061f373391e40a95126f
author Nan Zhang <nanzhang@google.com> 1519266558 +0000
committer android-build-merger <android-build-merger@google.com> 1519266558 +0000

Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd
am: 90b8d087e6

Change-Id: I7360282931fa4646e733f7326aea5a2a3cea1a97