OSDN Git Service

resolved conflicts for merge of f61c3d07 to master
authorAdam Powell <adamp@google.com>
Wed, 18 May 2011 17:33:20 +0000 (10:33 -0700)
committerAdam Powell <adamp@google.com>
Wed, 18 May 2011 17:33:20 +0000 (10:33 -0700)
commit2e6b4ad76c7b18d10aeffd19ecc743313eabbfaf
treea19e6d60909677b05c717fbb00addf25b13c6715
parent37250130b619616dbcb97483fe248832a9777e99
parentf61c3d077dbf804627e42f773dbbe51fcc3225ca
resolved conflicts for merge of f61c3d07 to master

Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b
core/res/res/values/dimens.xml
core/res/res/values/styles.xml