tree 672895a1c8eea30521eb21546dd76b19bbf227f9
parent 554d9edf6decc27ce7c6066317f72f489dc35644
parent 6dea7ba05c4f2452c90e05da1761090973c8e6b5
author Christopher Wiley <wiley@google.com> 1440811677 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440811677 +0000

am 6dea7ba0: (-s ours) am 4f8653c3: (-s ours) am 3fc6f441: (-s ours) Merge "Do not merge namespaces"

* commit '6dea7ba05c4f2452c90e05da1761090973c8e6b5':
  Do not merge namespaces