commit | 061ccdd8c93e1e174639efdc7850836cac216232 | [log] [tgz] |
---|---|---|
author | Android Merger <android-build-merger@google.com> | Tue Feb 14 22:37:43 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 14 22:37:43 2017 +0000 |
tree | 04a7496192f3c92a7326d378b37ba3b7a1b02ccf | |
parent | 1590e4a67d072c7afb151bf09787056e9211d2bc [diff] | |
parent | 1de2e67c49c4e7e35d0be4217e3a9924da2ce031 [diff] |
Merge "Merge "DO NOT MERGE Add test for security bug 32873375" into marshmallow-cts-dev am: 2a79aaba44 -s ours" into nougat-cts-dev