tree 5c6efe43f615202d25da102384ad6f67a26972e7
parent 998e8e5c26b7fe9008296f7379c1b7ae1ccf13e8
parent 2c19a93951d9109277cb55cd770786a567025476
author Jordan Liu <jminjie@google.com> 1477080537 +0000
committer android-build-merger <android-build-merger@google.com> 1477080537 +0000

Merge "Fix siminfo table creation"
am: 2c19a93951

Change-Id: I115ca533b162fdd5953280fe29e15815b6aa479f