OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Nov 2012 19:35:01 +0000 (11:35 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Nov 2012 19:35:01 +0000 (11:35 -0800)
commitab529f13368a07e619f7aa2147164eeca91144db
tree1325f623d904d5f170f8b175c2dca25a2e3917ae
parentb791a5fb7930e8ad8108e59fb87b6183e516a382
parent4afe3efb7348ad253708d71a804c00a98996fea5
Reconcile with jb-mr1-release - do not merge

Change-Id: I6b6342bf7e65019d9efeb2ff138ffb728bbef063