OSDN Git Service

am 542e6c87: am d9ba757e: Merge "Sync up nameser with upstream(2014.03.05)"
authorCalin Juravle <calin@google.com>
Fri, 7 Mar 2014 19:29:50 +0000 (19:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 19:29:50 +0000 (19:29 +0000)
commita7c42b126838b4fcc43e722a361501a553b96165
treecf1e52d69358832e3c029d3b241f22f57788f905
parente4014d88822ccd5c6a4e1ab48f8dfbe7f0e9871c
parent542e6c87e52f7886e5ede72e3222c2d6ed83aefb
am 542e6c87: am d9ba757e: Merge "Sync up nameser with upstream(2014.03.05)"

* commit '542e6c87e52f7886e5ede72e3222c2d6ed83aefb':
  Sync up nameser with upstream(2014.03.05)