OSDN Git Service

am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master
authorDan Albert <danalbert@google.com>
Thu, 5 Mar 2015 23:50:35 +0000 (23:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Mar 2015 23:50:35 +0000 (23:50 +0000)
commit7a79c4cac3b0c722832e868346db2375b6d6c379
treea3132be85962bbc6822a7d82fc1313693be43017
parentdcfa5e03f76e6ba9579125669d07cac09cde8cd2
parentf8d6a4ba8739e16e13ae0014efa099ec564939a7
am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master

* commit 'f8d6a4ba8739e16e13ae0014efa099ec564939a7':
  Stop using namespace std.