OSDN Git Service

am 08842ae7: am 12c909b2: resolved conflicts for merge of 9057f619 to klp-modular...
authorYing Wang <wangying@google.com>
Wed, 26 Feb 2014 01:43:50 +0000 (01:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Feb 2014 01:43:50 +0000 (01:43 +0000)
commita914a0d7b26321571d37e569ee938a2ffe8d0324
treedf53d7ffde14fdba98c768c80ec95c2762ca9ff4
parent9a1a933129da6c6fa0bc12beb38798e4b47ee46f
parent08842ae767b03776224baa7164a1d7f294e5b166
am 08842ae7: am 12c909b2: resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp

* commit '08842ae767b03776224baa7164a1d7f294e5b166':
  Remove external/wpa_supplicant_8 and external/android-clat