tree ba774730a4b8a0c7ca2b9cb465ec3a431f7fbb76
parent 5fb858e252e1e3e5bb275ba4fe938d6f42ff0efc
parent d49fe3130ed2460022ba98b376543e1a7aa30605
author Jon Miranda <jonmiranda@google.com> 1567113007 -0700
committer android-build-merger <android-build-merger@google.com> 1567113007 -0700

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

Change-Id: I0cf993f3f7a125a7b4853143cec4cf04d5ad8b73