OSDN Git Service

am ad503698: am 82126845: Merge "Zen: make Condition available over @SystemApi" into...
authorJohn Spurlock <jspurlock@google.com>
Tue, 16 Sep 2014 00:08:07 +0000 (00:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 00:08:07 +0000 (00:08 +0000)
* commit 'ad5036989289662b8ee191715552868a4849ba4b':


Trivial merge