| commit | 3477bb3ccf8906989cf9af731dc55b6dc1097450 | [log] [tgz] |
|---|---|---|
| author | juanjuan.hou <juanjuan.hou@spreadtrum.com> | Mon Aug 28 19:38:25 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 28 19:38:25 2017 +0000 |
| tree | a722a5c978e413aa48ee789cf1fffb95db68b519 | |
| parent | 8caf0d65652ec963718fc83f811425b615aa0b48 [diff] | |
| parent | f55253c4db5e4f22661acae6919542536ac12e9c [diff] |
Merge "Merge "[DO NOT MERGE] android.content.cts.ContentProviderCursorWindowTest--testQuery FAIL on 5.1_r22" into lollipop-mr1-cts-dev am: a12265ddbb -s ours" into marshmallow-cts-dev am: 851d380d36 -s ours am: 06b7a842ed am: 8cddabb18e am: d90ced16f1 am: e06ea29ad0 -s ours am: f55253c4db Change-Id: I9dfbfd392337737db780a94f1f15641faa200aa0