| commit | 96184e6847f1cce457ae47596999a3bade40515a | [log] [tgz] |
|---|---|---|
| author | juanjuan.hou <juanjuan.hou@spreadtrum.com> | Mon Aug 28 19:28:50 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 28 19:28:50 2017 +0000 |
| tree | dadf131b97faf5978b8692492dd7f64e3e5ba0e0 | |
| parent | 786c447e45280d940600eeda70711b7ba8761bcc [diff] | |
| parent | 720308af41c04c0be659401f46a9b5545539193e [diff] |
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 am: 8904aad12a am: 8caf0d6565 am: 6a298f1a1c am: 720308af41 Change-Id: Ib12b3532f0545fb857604a02f7d219ac5d8441bc