| commit | effb7e8c15fca33dccdc17d818dddc53800c3e65 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue May 24 20:28:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 24 20:28:38 2016 +0000 |
| tree | cd339ff1455ac586be928a5d14626d838129c7ae | |
| parent | ab76fa8bd5bbef0d0b9690d701077a766b1a61cc [diff] | |
| parent | 718e76198b4fd94a94d5620d1a8785d0c319e612 [diff] |
resolve merge conflicts of 1750081 to nyc-dev-plus-aosp am: 261a733906 am: 718e76198b * commit '718e76198b4fd94a94d5620d1a8785d0c319e612': dumpstate: sscanf requires an asciiz string Change-Id: I298d26bf09933048ffbb3f48dc905498de46adc2