tree f96629886efc49d81db6300ec9eefc188178e283
parent f7b5d5fbaa52805527e48efe23b31ca7040624b4
parent 4b7cbf83950f0aeaa7dbec77be8a0e55eca8b896
author Yifan Hong <elsk@google.com> 1504031688 +0000
committer android-build-merger <android-build-merger@google.com> 1504031688 +0000

Merge changes from topic "kernel_config_arch"
am: 4b7cbf8395

Change-Id: Ic48088745d443c39cdea9d967412e21af2d28107