| commit | e3708747f9e7e5144eb1e71521df69af1f662980 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Feb 14 22:48:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 14 22:48:46 2017 +0000 |
| tree | dcf2309d8ed3ca179c85daa7432828b39a362a74 | |
| parent | c6741fc57af84320674f7e7f947debadc3686500 [diff] | |
| parent | 5137652dfe2a5c90382cd8a1658ff3d036d0d482 [diff] |
Merge "Merge "DO NOT MERGE Add test for security bug 32873375" into marshmallow-cts-dev am: 2a79aaba44 -s ours" into nougat-cts-dev am: 061ccdd8c9 -s ours am: 5137652dfe Change-Id: I61c0eb759c81701533ce823f29c178c0dedb7238