tree 1161a062596a31ab863511f1dc12ddef170116bd
parent 4a9200308c658499091d7f4450018ba14d55c4d3
parent c510b7fb9bd527a37112cd8caff60968973a08a4
author Roger1 Jonsson <roger1.jonsson@sonymobile.com> 1491932450 +0000
committer android-build-merger <android-build-merger@google.com> 1491932450 +0000

Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc
am: c510b7fb9b

Change-Id: Ia652aac790d73def27c400b1ac327a4ad1ff8ceb