commit | 61a74da6663add9e6f5619f50d6dcc3ab8789b16 | [log] [tgz] |
---|---|---|
author | Android Merger <android-build-merger@google.com> | Mon Jan 23 21:57:40 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jan 23 21:57:42 2017 +0000 |
tree | 245a8705ea76969ad234f78ac3ec630751ff85a1 | |
parent | 307b529750d3173ff2c4c58304e7ccba46f88ad6 [diff] | |
parent | 1ced4f6db5febb80f833a380bc537c3567d30ec8 [diff] |
Merge "Merge "DO NOT MERGE: StagefrightTest: add CTS test for bug 32322258" into marshmallow-cts-dev am: 50076bda67 -s ours" into nougat-cts-dev