Merge "Revert "flacky unit test"" into oc-dev
authorChen Xu <fionaxu@google.com>
Wed, 17 May 2017 06:34:57 +0000 (06:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 17 May 2017 06:34:58 +0000 (06:34 +0000)
commit7f4339996f79d9fd2589189b7db845b7392180a5
tree85adeddfe98ffc7676dd4fa1869c83a8f29042bb
parentfde4aeebff219a68968477644fd1392e51080614
parentf6588582688ecbe8fa58257f2caee2495e52f79a
Merge "Revert "flacky unit test"" into oc-dev