OSDN Git Service

am e20724c9: resolved conflicts for merge of 3154443d to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Wed, 13 Jul 2011 21:55:30 +0000 (14:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Jul 2011 21:55:30 +0000 (14:55 -0700)
commitd5f550bb2f556c5d287f7c8d2b77223654bcec37
tree6fc77f310747adc4bace85a7595508c1ffadb72a
parent0b0dd1ca591da7b2d0200e37174affe549bdd302
parente20724c9c530e03bdeaf3f6ff31f2334ea7ffc72
am e20724c9: resolved conflicts for merge of 3154443d to gingerbread-plus-aosp

* commit 'e20724c9c530e03bdeaf3f6ff31f2334ea7ffc72':
  Change systembuilder tag to optional