OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:39:15 +0000 (07:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:39:15 +0000 (07:39 -0700)
commit8280f93403bfd5d5e24ebfb969f22e2e5d36f85e
tree18726a22268df3533dd5cba83e99482522e828e6
parent605ca505f43f4e21f6caed855d0c761b8bc2f6d1
parent90dbdf26e6fa8093ff2a3803f84f0020ee81647b
parent71a635dd58505ad1770ff8fb8ba137664c9ec3fe
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I0ae4d2e710b5380f13fea6f62352842679ed248b