| commit | f55253c4db5e4f22661acae6919542536ac12e9c | [log] [tgz] |
|---|---|---|
| author | juanjuan.hou <juanjuan.hou@spreadtrum.com> | Mon Aug 28 19:28:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 28 19:28:53 2017 +0000 |
| tree | e85fd9836714021f290f1ee06b3bf7b61aac92f1 | |
| parent | 8904aad12aac400057e3b5d8a73a31109fd29721 [diff] | |
| parent | e06ea29ad0215ef86f4e6bb21b8afef540da7de4 [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 Change-Id: I04648d59b469a1473b94f31467ee90be1691f3b7