OSDN Git Service

am e3734499: Merge "Update for libbase."
authorDan Albert <danalbert@google.com>
Sun, 15 Mar 2015 22:34:02 +0000 (22:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 15 Mar 2015 22:34:02 +0000 (22:34 +0000)
* commit 'e37344992f49c8e0e6e9b816f590afbd00a961ca':
  Update for libbase.

1  2 
server/Android.mk
server/SoftapController.cpp

Simple merge
Simple merge