OSDN Git Service

am c5b6bd8e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jun 2013 14:25:54 +0000 (07:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Jun 2013 14:25:54 +0000 (07:25 -0700)
commit69f5c14952394952e8644d4dddf64ac722eae143
treef2c68f73e1d2d94dc8b765392e5dba98f7d33b8a
parent53cb7a2ff28c53f80e1404d92923e41ceaac4f32
parentc5b6bd8e53e38db1afd543262490fccc1962f3e9
am c5b6bd8e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit 'c5b6bd8e53e38db1afd543262490fccc1962f3e9':
  Fix text size in the state panel