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