commit | 3b3b08f44da465421e5f70c130a36fa133ce00ee | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Sep 05 14:14:30 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 05 14:14:30 2019 -0700 |
tree | b041d987051dfefacb55d1e3d78722aa6934be70 | |
parent | 18b8512d4622a266c6562273b8ab9fa2b22dc681 [diff] | |
parent | 180bdfd37da57e308943baf91bae71a237907846 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 42aa89c0b1 -s ours am: c118fcc13a am: 4740356d31 am: 180bdfd37d -s ours am skip reason: subject contains skip directive Change-Id: Iff4721847dffa6ab9079399188395859e433c655