OSDN Git Service

am 943ba3cc: Merge "Add NBAIO_Sink::getTimestamp()" into klp-dev
authorGlenn Kasten <gkasten@google.com>
Tue, 3 Sep 2013 22:12:48 +0000 (15:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 Sep 2013 22:12:48 +0000 (15:12 -0700)
* commit '943ba3cca8df0da24db38e97e43aaacb5b788a21':
  Add NBAIO_Sink::getTimestamp()


Trivial merge