OSDN Git Service

Reconcile with jb-mr0-release jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 21:47:40 +0000 (14:47 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 21:47:40 +0000 (14:47 -0700)
commit8665eb732364b31506719dcce99237e13cc87866
tree5566d88735b4465c244fadec217141a30a4da887
parent37132103a2d60c7ceb0ede1f34d8b3c633d7c09e
parent4f587c5839129266283ec28fd8b0246b85c05e62
parentef88e79f95431893aac846aee0359097a65553c5
Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: I62fe0d8e8c927ef31e1d3cd44775a7018828af95