OSDN Git Service

am b016794c: am 129be820: am 6b835426: (-s ours) am 92e99b12: Merge "add jsr166 tests...
authorNarayan Kamath <narayan@google.com>
Mon, 12 May 2014 23:26:41 +0000 (23:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:26:41 +0000 (23:26 +0000)
* commit 'b016794c22b4eff712ddd531a3d9149f9a695a9f':


Trivial merge