OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:19:01 +0000 (09:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:19:01 +0000 (09:19 -0700)
commited9208c36ae0d0d93f93412e76eb0ce7d41eed7b
tree38d9ca70713201a2d5a8e00f590eaf320b9c4516
parent9d54738752df617af3bf281bc1969136fb08943d
parent80d69a7349b7311e6fd2769a8a2b83d0e573562b
Reconcile with jb-mr1-release - do not merge

Change-Id: I687546ca2bdfc152e141cda550975329f2bec732