OSDN Git Service

resolve merge conflicts of 9ac842a753 to nyc-mr2-dev-plus-aosp
authorPhilip P. Moltmann <moltmann@google.com>
Tue, 14 Feb 2017 17:45:51 +0000 (09:45 -0800)
committerPhilip P. Moltmann <moltmann@google.com>
Tue, 14 Feb 2017 17:51:34 +0000 (09:51 -0800)
commitafe6320d70f46e8af724ef2cde86a5963d198868
tree6d14ad4778b1ab3cba83297a9cccc68d39fd2e87
parentdaa2d5a23a6e6fceae9fe1d44e8e182be0429336
parent9ac842a753ebd0b228fe31a81671ff60c23fe1e7
resolve merge conflicts of 9ac842a753 to nyc-mr2-dev-plus-aosp

Test: built
Change-Id: I156db22c13da98bce0077b2acb8d9f1a3d2ce406
src/com/android/settings/RadioInfo.java