OSDN Git Service

am 81044820: (-s ours) am acc70a3a: Merge "Add content description to wifi networks...
authorJason Monk <jmonk@google.com>
Thu, 27 Aug 2015 11:32:06 +0000 (11:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:32:06 +0000 (11:32 +0000)
* commit '810448204fd3fa4fd305fd40ee89da81cbd57d0f':


Trivial merge