| commit | c328c02888394e4dd665b38a039ec59939ebb2e8 | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Sat Aug 29 01:27:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 29 01:27:57 2015 +0000 |
| tree | 672895a1c8eea30521eb21546dd76b19bbf227f9 | |
| parent | 554d9edf6decc27ce7c6066317f72f489dc35644 [diff] | |
| parent | 6dea7ba05c4f2452c90e05da1761090973c8e6b5 [diff] |
am 6dea7ba0: (-s ours) am 4f8653c3: (-s ours) am 3fc6f441: (-s ours) Merge "Do not merge namespaces" * commit '6dea7ba05c4f2452c90e05da1761090973c8e6b5': Do not merge namespaces