OSDN Git Service

am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1
authorAmith Yamasani <yamasani@google.com>
Thu, 17 Nov 2011 18:02:16 +0000 (10:02 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Nov 2011 18:02:16 +0000 (10:02 -0800)
commit1543c668afd4326e2a3f4ad39bcd8ec5b6ca5d27
tree6612a4783a0af5dacf89a520c8ea80420dc0103b
parenta0e70be221c23ed8a5a4de48cca96aad474a0e89
parent9ae6c9c4d64b915a911aa9fc8caa23bd0e489920
am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1

* commit 'aefc0ed9677233d5e8c991196f970222b4899dc3':
  Don't upgrade some settings from GB to ICS.