OSDN Git Service

am 3fc6f441: (-s ours) Merge "Do not merge namespaces"
authorChristopher Wiley <wiley@google.com>
Fri, 28 Aug 2015 23:19:02 +0000 (23:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 23:19:02 +0000 (23:19 +0000)
commit4f8653c3715631d7b8d3b1e3ea600b6b1755addc
tree808c24457a1cd96d22249304f8ee32047b691d03
parent9cc1765d1ea4f2990e1916cde505a574369497da
parent3fc6f441ac88aff88a9c474bd1ae93dfde3ed11a
am 3fc6f441: (-s ours) Merge "Do not merge namespaces"

* commit '3fc6f441ac88aff88a9c474bd1ae93dfde3ed11a':
  Do not merge namespaces