tree 2ee74a3b840f9767effed1f481e3b89a8cdb9720
parent 23fbb627023d195f5da15ff9f1823c15ef313b3e
parent b9108baa01d2bbae57a804e46eea734c4fc3256f
author Chong Zhang <chz@google.com> 1520640750 +0000
committer android-build-merger <android-build-merger@google.com> 1520640750 +0000

Merge "fix null terminated string parsing" into pi-dev am: c4a633e4f2
am: b9108baa01

Change-Id: I583851fe62edd29851c86121794ef36695c9389f