commit | 580feb3eff6ab81b527ae16528a510ede8ebc64c | [log] [tgz] |
---|---|---|
author | Jin Qian <jinqian@google.com> | Tue Nov 22 18:56:28 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 22 18:56:28 2016 +0000 |
tree | a3c5d43a6f08a33e2c57e5f95373f35312db7529 | |
parent | 77d6d507537b8808303102cffc80f277ffb3dcc6 [diff] | |
parent | 280500742e4257a05b04d606717a886d70069c06 [diff] |
Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master" am: 72662414f6 am: 960584eeb0 am: f8a4fc97d6 -s ours Change-Id: I7180d073692bca1df2207c20fe3365565f988fcc