OSDN Git Service

resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp
authorPavel Zhamaitsiak <pavelz@google.com>
Wed, 28 Jan 2015 21:07:57 +0000 (13:07 -0800)
committerPavel Zhamaitsiak <pavelz@google.com>
Wed, 28 Jan 2015 21:07:57 +0000 (13:07 -0800)
commitd67ad203db73eb986f105cf65c85467ad610b221
tree83a76e8a743f9ad3d2d9eb6418a3d964285d5910
parent318a0601909b77ac68607cddc6d87eea5e32c3b6
parent236828098ca1f0e144e0e08a7d79e13f82dda4e9
resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp

Change-Id: Ia6ad086dad93e5230ec59287d96e736e8d785320
src/com/android/settings/RadioInfo.java