commit | c8108516088d3152d1e3c01af3854010def7b979 | [log] [tgz] |
---|---|---|
author | Android Merger <android-build-merger@google.com> | Tue Aug 08 21:37:42 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Aug 08 21:37:42 2017 +0000 |
tree | b202f7fa150ed5102f27d540fc61f19ad55302f3 | |
parent | 8876f215f00fb0831f101950e41b7d0a0a824656 [diff] | |
parent | e8683caebacf35dbecd3c43f0635b802beee291b [diff] |
Merge changes from topic 'am-b01079a28be1492382951291689043df' into marshmallow-cts-dev * changes: Merge changes from topic 'l1' into lollipop-mr1-cts-dev am: bd82863e0f DO NOT MERGE StagefrightTest: add test for OOB write in sonivox. am: 255ec553e9 -s ours