commit | eb7641ed655dc36a4a1f2dab1929de9fb6c64106 | [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 | 5da432af4eefeef55b70c5533f204718959f32e0 [diff] | |
parent | 580feb3eff6ab81b527ae16528a510ede8ebc64c [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