tree c9a90c8739360c442669ed3fbbd460e10f3aa9c3
parent b00f80cc6554b9c605a16caf63788647e7501641
parent ca352f3623ed6e3afb1c70b1daedaa29ec3b73a5
author Bo Hu <bohu@google.com> 1442425987 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442425987 +0000

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

* commit 'ca352f3623ed6e3afb1c70b1daedaa29ec3b73a5':
  emulator.mk: Add ethernet permission