commit | a2f91257fd873152a2a2a25f2f842efdaa53d846 | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Thu Jul 14 01:41:18 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 01:41:18 2016 +0000 |
tree | cdce7cb1c46d5ce87db706b2a8cbb09ae027660c | |
parent | 1f5fe85d74b34b4e4e04ffb7f5307a26cd02b8c2 [diff] | |
parent | e3c1c2d73474953a953185bd3cb2e9f502d1bdd4 [diff] |
Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154 am: e3c1c2d734 -s ours Change-Id: I018c8bedc4d810b7abca34ff4273e249ebc0648f