tree c0e05f77c565766bbcf85d2523b4726ddc8f3a51
parent 2867533add946cd9d2294ed3b4976f5ecf7aa76e
parent 79215cdeabbc43e47cbfe212eed02e6958ebfb8b
author Ying Wang <wangying@android.com> 1449078918 +0000
committer android-build-merger <android-build-merger@google.com> 1449078918 +0000

Merge "make USER limited to 6 characters when generating BF_BUILD_NUMBER" am: 88ca8aff3e
am: 79215cdeab

* commit '79215cdeabbc43e47cbfe212eed02e6958ebfb8b':
  make USER limited to 6 characters when generating BF_BUILD_NUMBER