tree 733db52f1a1a585ce8df3c6dd467308e6a68ef9a
parent 5439fcbb01876f5a3f865c6d32c441f92e02a5aa
parent 73eaa54c8702616df01bfacdfa2496d17119a15f
author Wonsik Kim <wonsik@google.com> 1513723504 +0000
committer android-build-merger <android-build-merger@google.com> 1513723504 +0000

Merge "fix elst calculations" am: c10a3e93cc am: ee4079a30e
am: 73eaa54c87

Change-Id: I27c37ebb1ccc25618c5955d2d4db70c314f3a2d2