tree b818483fee1cc5557c136bca0625f829bd65cd15
parent 2029791350328fa1eb461c7b9b26710b8004163d
parent 6d98051a8fab8ba37e661b746f024907b2425be4
author Bo Hu <bohu@google.com> 1442426715 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442426715 +0000

am 6d98051a: am 8cb586a5: am ca352f36: am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev

* commit '6d98051a8fab8ba37e661b746f024907b2425be4':
  emulator.mk: Add ethernet permission