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)
commit2afc0644f3e6e0c63c5ee8cdb50b48171f62877c
tree18cdd0e276dcaaf20dd0263a21c89d1e235f71a7
parentf3577f9a236c3e6ce4a186286c6165909f75eb90
parent2fdaa6c599657264b7dda3008f9daa1eff3267ae
Merge "Fix test failure." am: 11b3916b83
am: 2fdaa6c599

* commit '2fdaa6c599657264b7dda3008f9daa1eff3267ae':
  Fix test failure.