| commit | 25ff18e161e098a08ff7ade7a697764fdb417669 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Mar 24 14:38:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 24 14:38:33 2016 +0000 |
| tree | 0da8af75825d9e5d160782786dbdd97c6cc1f55c | |
| parent | cbf7a90e82b7c0d214167eff3a51a55947c6fd1f [diff] | |
| parent | 1345aa365e8baae25d2b3a859a4858fffbe6b11f [diff] |
Merge "Fix stub_test after semantic conflicting merge." am: 1345aa3 * commit '1345aa365e8baae25d2b3a859a4858fffbe6b11f': Fix stub_test after semantic conflicting merge.