tree 5c6efe43f615202d25da102384ad6f67a26972e7
parent 449828160ad1d7519fba690b10fe6efa5af1b7c6
parent 0af0f8297dc59ac39d3f1ea2f4e7857d0f09b719
author Jordan Liu <jminjie@google.com> 1477081078 +0000
committer android-build-merger <android-build-merger@google.com> 1477081078 +0000

Merge "Fix siminfo table creation" am: 2c19a93951
am: 0af0f8297d

Change-Id: I214699d5b98918859ad2b6925c48fe4a3c313037