| commit | e84e127448ad507762815c60cb0f3f6e6e219f61 | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Tue Nov 22 18:59:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 22 18:59:30 2016 +0000 |
| tree | 88b88c671d7194b00c1799c5ee15d34e48caed30 | |
| parent | 7374bca9c5851ab1620b183e2bf97f052ee224f6 [diff] | |
| parent | 2edf6d5579855f041ab4d5c6fd431b6d9a59fd13 [diff] |
Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master" am: 72662414f6 am: 960584eeb0 am: f8a4fc97d6 -s ours am: 2edf6d5579 Change-Id: I8216bf227bdf1b1def66479775415d487883b223