| commit | ff2ab6e7814b6782a7517628f18aa8fc8d886881 | [log] [tgz] |
|---|---|---|
| author | juanjuan.hou <juanjuan.hou@spreadtrum.com> | Mon Aug 28 19:09:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 28 19:09:20 2017 +0000 |
| tree | 389d77173472ad47678a4b41fa2f10c0236b3fc3 | |
| parent | a9e8d8a372a00fe195d28789518b44198f19775b [diff] | |
| parent | d10b829c9e7799272827a9633bb03377b5d1ba24 [diff] |
Merge "Merge "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" into nougat-cts-dev am: a1655aefb2 -s ours" into nougat-mr1-cts-dev am: e44bfd9441 -s ours am: d10b829c9e Change-Id: Idfeb48197da1598b56dc565b6c4595ac8910ec0f