OSDN Git Service

am 36bde447: (-s ours) am a5913fbb: am a2f11f81: am caec50ec: docs: changed version...
authorCheryl Potter <cherylpotter@google.com>
Thu, 27 Aug 2015 10:34:28 +0000 (10:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:34:28 +0000 (10:34 +0000)
* commit '36bde447f94a089acc70bdfaef089d7fc7f57707':


Trivial merge