| commit | 81202d5fe999d79a833d5606d7e8344f73d06955 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Thu Mar 16 22:16:14 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 22:16:14 2017 +0000 |
| tree | 37fc8d601b35d0549389b9e0203e63157716d3e2 | |
| parent | b11aa5ee8877a3bac4422325afb760cb8c551f33 [diff] | |
| parent | 0108b63ba2fef772e9503890ad1d9d35d3f9e516 [diff] |
Merge "Merge "DO NOT MERGE: Add AudioSecurityTest" into lollipop-mr1-cts-dev am: 6681cd03cd -s ours" into marshmallow-cts-dev am: 0108b63ba2 -s ours Change-Id: I4d4c945eeec6afedaf1fb69aad38730d88fc36f7