OSDN Git Service

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

* commit '2fdaa6c599657264b7dda3008f9daa1eff3267ae':
  Fix test failure.


Trivial merge