OSDN Git Service

am a914a0d7: am 08842ae7: am 12c909b2: resolved conflicts for merge of 9057f619 to...
authorYing Wang <wangying@google.com>
Wed, 26 Feb 2014 01:46:07 +0000 (17:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Feb 2014 01:46:07 +0000 (17:46 -0800)
commitaf93f5585e2301b1828874d1abef94e521119379
treee841cda172724da9e4041588efbede7bcee151d3
parent2f59df656662c86e380b19fab32e5bb5f04a7347
parenta914a0d7b26321571d37e569ee938a2ffe8d0324
am a914a0d7: am 08842ae7: am 12c909b2: resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp

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