commit | 6986660e1e5a423cf244b22ef172db28a8873e2f | [log] [tgz] |
---|---|---|
author | Felipe Leme <felipeal@google.com> | Thu May 23 15:39:46 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 23 15:39:46 2019 -0700 |
tree | d1ac0b7c8889ef39c11d22aaa19ee8d8d77b232e | |
parent | 5bcc7a413d359ec7437f1f91e46bad2adad3bd4f [diff] | |
parent | 3fe70c6af0d625514d950b87c4bd551c847a00c0 [diff] |
[automerger skipped] DO NOT MERGE - Re-add ContentCapture support from standard SDK toolkit. am: 911cb1fa76 am: 3fe70c6af0 -s ours am skip reason: subject contains skip directive Change-Id: I1ee99dd3b4ac4243e0fb756624d01e8141ea147e