tree 382d575c21cf86d34e2f2b861b9adaf2225083f4
parent e1c1b76884832ce5420752c5ba3d5ea871507643
parent 21d11190702ad7241e292335aef772f11573e4a2
author Jon Miranda <jonmiranda@google.com> 1568236976 -0700
committer android-build-merger <android-build-merger@google.com> 1568236976 -0700

[automerger skipped] [DO NOT MERGE] Fix NumberFormatException for launcher. am: 241cd90203
am: 21d1119070 -s ours
am skip reason: subject contains skip directive

Change-Id: I3b186220920c7c7ffaa04eda46984294398a5fb4