| commit | e73f2136e0701db7e64bb698bf801d1e56598750 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Oct 09 15:32:03 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 09 15:32:03 2019 -0700 |
| tree | 58b3e27e666afa0b2f513aa3f678a1ead7d70c83 | |
| parent | d7dca51c331fd47e7b5bd7d70293e90612985a05 [diff] | |
| parent | df7a95c8a04e5ea729724105bb9ba9c1feeb429b [diff] |
[automerger skipped] Merge "Split datasource out of libstagefright" am: 229c543d08 am: 448242fe09 am: 3ae6a9450c am: df7a95c8a0 -s ours am skip reason: change_id I34d9937235c78f18f51b18945342a0743e209577 with SHA1 42057ce189 is in history Change-Id: Ic2435502cc9220d426d6772bfb83cbb70b1bb609