OSDN Git Service

am bc99ab0f: (-s ours) am 1d266660: am f51bebd5: Merge "Increased time to wait in...
authorpriya <priyar@google.com>
Wed, 30 Apr 2014 18:14:45 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:45 +0000 (18:14 +0000)
* commit 'bc99ab0fcabce48468185c1b0bce8c498ab18a62':


Trivial merge