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)
commit2fdaa6c599657264b7dda3008f9daa1eff3267ae
tree18cdd0e276dcaaf20dd0263a21c89d1e235f71a7
parentdcf501913d1537b2b980aeee6b4a8bb6da0eb0d5
parent11b3916b83e33fce9e3123659fe4e61ef84d39b5
Merge "Fix test failure."
am: 11b3916b83

* commit '11b3916b83e33fce9e3123659fe4e61ef84d39b5':
  Fix test failure.