tree b4195f8225224babbcda96d51a6641eb3029c7bd
parent edeed28bd397f863686ba3e5bb7479f881efc657
parent 36b39a97f3fc5790538e2e69429043b78ba486e4
author Colin Cross <ccross@android.com> 1379540429 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379540429 -0700

am 36b39a97: Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output"

* commit '36b39a97f3fc5790538e2e69429043b78ba486e4':
  init: Fix get_hardware_name() to cope with long /proc/cpuinfo output