commit | 43375564df4176093e8c4b515bd2efc1f4cc4b7d | [log] [tgz] |
---|---|---|
author | Android Merger <android-build-merger@google.com> | Tue Feb 14 22:38:12 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 14 22:38:12 2017 +0000 |
tree | 04a7496192f3c92a7326d378b37ba3b7a1b02ccf | |
parent | 6207b952cd0001b80287d91e4c46c5453507c394 [diff] | |
parent | 11997e8f6ae6eb5415628125aefe068f1e8ebadf [diff] |
Merge changes from topic 'am-736a6572a9704bdf94c4c8f32eb82316' into nougat-cts-dev * changes: Merge changes I5bfdcf90,I32b0ed5c into marshmallow-cts-dev am: 53e358786c DO NOT MERGE: CTS Test for security vulnerability fix: potential OOB write in audioserver am: e2f015fb2b -s ours