| commit | 6dea7ba05c4f2452c90e05da1761090973c8e6b5 | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Fri Aug 28 23:45:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 28 23:45:55 2015 +0000 |
| tree | 427cc9e74e91c4d4ec957d28c75a9f5a68f42215 | |
| parent | 1517c365aaf0d0248072f8292d5318dd4b7a80fe [diff] | |
| parent | 4f8653c3715631d7b8d3b1e3ea600b6b1755addc [diff] |
am 4f8653c3: (-s ours) am 3fc6f441: (-s ours) Merge "Do not merge namespaces" * commit '4f8653c3715631d7b8d3b1e3ea600b6b1755addc': Do not merge namespaces