| commit | 8cddabb18ee3c0df46373a09189580df5c464181 | [log] [tgz] |
|---|---|---|
| author | juanjuan.hou <juanjuan.hou@spreadtrum.com> | Mon Aug 28 18:59:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 28 18:59:17 2017 +0000 |
| tree | 6da52f539bde51572c98a96205a0268361b7f380 | |
| parent | 1fe01c00cbd139c6f191197640f840d58a68d025 [diff] | |
| parent | 06b7a842ed311c71f00932a4174fa9879e2f63a3 [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 Change-Id: I957403a23580ff169fc2ab0685ffa70c9b1b8b77