Lorenzo Colitti 954530f2f7 am fda87407: am ff01f81f: am e9f7e65c: Merge "Populate 464xlat LinkProperties only when the interface comes up." into lmp-mr1-dev ...

* commit 'fda8740722e60ff3c081228fc8fc548bf1007286':
  Populate 464xlat LinkProperties only when the interface comes up.

2014-11-18 02:31:52 +00:00

..

java/com/android/server

am fda87407: am ff01f81f: am e9f7e65c: Merge "Populate 464xlat LinkProperties only when the interface comes up." into lmp-mr1-dev

2014-11-18 02:31:52 +00:00

jni

resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

2014-11-12 13:24:42 -08:00

Android.mk

…