OSDN Git Service

am 815f7327: am e6e2c108: (-s ours) am 35066219: Merge "Fix network name not showing...
authorJason Monk <jmonk@google.com>
Thu, 27 Aug 2015 18:42:39 +0000 (18:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:42:39 +0000 (18:42 +0000)
* commit '815f73274947e5689eb7ee309bb51a3617c1983d':


Trivial merge