| commit | 7a79c4cac3b0c722832e868346db2375b6d6c379 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Mar 05 23:50:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 05 23:50:35 2015 +0000 |
| tree | a3132be85962bbc6822a7d82fc1313693be43017 | |
| parent | dcfa5e03f76e6ba9579125669d07cac09cde8cd2 [diff] | |
| parent | f8d6a4ba8739e16e13ae0014efa099ec564939a7 [diff] |
am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master * commit 'f8d6a4ba8739e16e13ae0014efa099ec564939a7': Stop using namespace std.