OSDN Git Service

resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp
authorLorenzo Colitti <lorenzo@google.com>
Fri, 4 Mar 2011 22:49:40 +0000 (14:49 -0800)
committerLorenzo Colitti <lorenzo@google.com>
Fri, 4 Mar 2011 22:49:40 +0000 (14:49 -0800)
commit67c70267d16996ced73ac2e7648b0a79baed3c16
treea7f0ee04771c982adf1cafbf9c378c8529966dc5
parente0db17733499a8922fcd742343d7d6210be04d55
parenta4fb8c868459ac0cf763916555c4e9963965242c
resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp

Change-Id: I8edb2e7f07f793e78c15bcf9b2f048d91b1f6504
src/com/android/settings/ApnEditor.java