tree f18821679c1697a56c8b7b57825526808ca63c8e
parent 410254f885db408ce209345841469e532a5ec0ab
parent 67bd4d13ba4d16440000545618744747ff62466d
author Brad Ebinger <breadley@google.com> 1487274547 +0000
committer android-build-merger <android-build-merger@google.com> 1487274547 +0000

Merge "Fix NumberFormatException in SipEditor when saving port number" am: 3a7d7b242e
am: 67bd4d13ba

Change-Id: Ib796d3769ccf7ca0ed2c58d866f9a9e92a527ee0