OSDN Git Service

am 8149820c: am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message...
authorSascha Prueter <saschap@google.com>
Mon, 17 Dec 2012 18:49:38 +0000 (10:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Dec 2012 18:49:38 +0000 (10:49 -0800)
commitab989ac313a996280aec61183636e3fb9ac21d9d
treef1ec8d0f02aede8725c6092c449056e75ac8fedf
parentc1b8f785384c26744effe9063d5cdb8ff970b417
parent8149820c2b2df47028498571785ca009d99b5dc9
am 8149820c: am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev

* commit '8149820c2b2df47028498571785ca009d99b5dc9':
  Handle "CODE_ALREADY_PRESENT" message from Settings app
core/java/android/widget/Editor.java