tree d2c8cdee61053563576e0800de3f648d70f01caf
parent a0abf49d2bdc42c81e5f636e54da9038de9dfc21
parent 2ad5c0cca46b7f0a159dbc90243756c84a93b093
author Bo Hu <bohu@google.com> 1442425559 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442425559 +0000

am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev

* commit '2ad5c0cca46b7f0a159dbc90243756c84a93b093':
  emulator.mk: Add ethernet permission