| commit | 2edf6d5579855f041ab4d5c6fd431b6d9a59fd13 | [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 | a1817f68b01afa6c6bdf39abda5e9fe4f790912f [diff] | |
| parent | f8a4fc97d6c18f823619e9a433f5f496ecc17c05 [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