| commit | 2f87e069e90948526cb557c5e696cc67c40ed968 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Sep 22 22:37:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 22 22:37:22 2014 +0000 |
| tree | ff4539f5be439790a9b1c412d83df4b5cf4d5008 | |
| parent | 9707ffaf0b574b7929d62b2fe683595e95ef7774 [diff] | |
| parent | 8f230382b86e7b431211ceb0263d06c4bba1bf6b [diff] |
am 8f230382: Merge "Fix a namespace collision." * commit '8f230382b86e7b431211ceb0263d06c4bba1bf6b': Fix a namespace collision.