tree f0b66439937d2bc0afb95e30ad6cc710bd8ae1ce
parent 0a465ac65d374a9c6bbc1610cbe7c831d143c5dd
parent 488107b85ccf2714598fa9d1273437e8f48741e7
author Lorenzo Colitti <lorenzo@google.com> 1423076257 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423076257 +0000

am 488107b8: am 1eccad2f: Make olddefconfig optional; it only appeared recently.

* commit '488107b85ccf2714598fa9d1273437e8f48741e7':
  Make olddefconfig optional; it only appeared recently.