commit | 8904aad12aac400057e3b5d8a73a31109fd29721 | [log] [tgz] |
---|---|---|
author | juanjuan.hou <juanjuan.hou@spreadtrum.com> | Mon Aug 28 18:57:21 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 28 18:57:21 2017 +0000 |
tree | e85fd9836714021f290f1ee06b3bf7b61aac92f1 | |
parent | 5d552c2638f339bc6ea5e03ab6c4119be88158cc [diff] | |
parent | a1655aefb2486526719710bfba2d2d888737044b [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 Change-Id: I95ee22e76d7346bea65a645b84d13632afc46d4d