OSDN Git Service

am c0bc14a3: Add support for custom TXT records
authorChristopher Lane <lanechr@google.com>
Mon, 3 Mar 2014 23:28:26 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Mar 2014 23:28:26 +0000 (23:28 +0000)
* commit 'c0bc14a3c2f0efe1f368f2120de38e99ccb6d9f0':
  Add support for custom TXT records


Trivial merge