tree 2928e1ccae2364560ca71af009345c697bb97373
parent d40f3352e74c33eb202679199c4862ee6847e454
parent dc951513a36904e0d5b7f322c68e000aed5045f7
author Brian Carlstrom <bdc@google.com> 1385424046 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385424046 -0800

am dc951513: Merge "Update compiler blacklist to include java.net.NetworkInterface."

* commit 'dc951513a36904e0d5b7f322c68e000aed5045f7':
  Update compiler blacklist to include java.net.NetworkInterface.