OSDN Git Service

am 82a1f1bc: (-s ours) am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge...
authorDavid Friedman <dmail@google.com>
Thu, 27 Aug 2015 10:37:49 +0000 (10:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:37:49 +0000 (10:37 +0000)
commit1b8eb5f226fc95821e9a37ee2066e5cdc39af46a
tree715d547d2502de8d04de0ec12233b3183ce62c99
parentfe63ed548c370e177fa151cce3fb0076ac818037
parent82a1f1bc9464b985a9cf89338ebfef882602b7b3
am 82a1f1bc: (-s ours) am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev

* commit '82a1f1bc9464b985a9cf89338ebfef882602b7b3':