OSDN Git Service

am 12c909b2: resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp
authorYing Wang <wangying@google.com>
Wed, 26 Feb 2014 01:40:44 +0000 (01:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Feb 2014 01:40:44 +0000 (01:40 +0000)
commit08842ae767b03776224baa7164a1d7f294e5b166
tree051ed32b3c3d63bb8d50f5c657f3f590e7cab3e3
parent9f3e1d788e32212cdac8e8c955c28d773bfe062b
parent12c909b20c2a1f8be74914186e54c4143ddc263e
am 12c909b2: resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp

* commit '12c909b20c2a1f8be74914186e54c4143ddc263e':
  Remove external/wpa_supplicant_8 and external/android-clat