| commit | de86cf1362ef0461b589fa85bdd5c58921010c6a | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Sep 09 04:23:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 04:23:57 2014 +0000 |
| tree | 2d96dfb436f04770228a28bbacfbc2b2cb936cfb | |
| parent | 00fe3544f60ccb6f8da01824a684ebd83d68c25c [diff] | |
| parent | 5a6934c07946743e622df52ba1155d97129b37f0 [diff] |
am 5a6934c0: Merge "Don\'t pollute the namespace for two uses." * commit '5a6934c07946743e622df52ba1155d97129b37f0': Don't pollute the namespace for two uses.