| commit | 4f8653c3715631d7b8d3b1e3ea600b6b1755addc | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Fri Aug 28 23:19:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 28 23:19:02 2015 +0000 |
| tree | 808c24457a1cd96d22249304f8ee32047b691d03 | |
| parent | 9cc1765d1ea4f2990e1916cde505a574369497da [diff] | |
| parent | 3fc6f441ac88aff88a9c474bd1ae93dfde3ed11a [diff] |
am 3fc6f441: (-s ours) Merge "Do not merge namespaces" * commit '3fc6f441ac88aff88a9c474bd1ae93dfde3ed11a': Do not merge namespaces