OSDN Git Service

Merge "Fix test failure."
authorJosh Gao <jmgao@google.com>
Tue, 10 Nov 2015 00:10:20 +0000 (00:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Nov 2015 00:10:20 +0000 (00:10 +0000)
am: 11b3916b83

* commit '11b3916b83e33fce9e3123659fe4e61ef84d39b5':
  Fix test failure.


Trivial merge