OSDN Git Service

am 6b835426: (-s ours) am 92e99b12: Merge "add jsr166 tests to cts. Bug: 10390711"
authorNarayan Kamath <narayan@google.com>
Mon, 17 Feb 2014 12:59:35 +0000 (12:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Feb 2014 12:59:35 +0000 (12:59 +0000)
* commit '6b83542627e28c09b08c0cf131fc9f0f3c30627f':
  add jsr166 tests to cts. Bug: 10390711


Trivial merge