tree c111ca6a611557c1454aec5f4d50e77c14bfb803
parent e72b6f46977437e6967a43d58c5d7c90206545b0
parent 98a4337796e7500675caadb436e1eb3fb7256f7a
author Elliott Hughes <enh@google.com> 1271882928 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271882928 -0700

am 3825d34f: am d4b6f6aa: am 1dd42bb9: Fix NetworkInterface on sholes/ppp.

Merge commit '3825d34f9cd5057504ced60962638ffb54f14e38' into dalvik-dev

* commit '3825d34f9cd5057504ced60962638ffb54f14e38':
  Fix NetworkInterface on sholes/ppp.