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