OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:07:43 +0000 (16:07 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:07:43 +0000 (16:07 -0700)
commitfc756f82d221fb04dc71c9d5e2e6ef8b75137a02
tree74c888c4113f1eab05c98db11956894e28f4b134
parenta834b3b41f12bf78d07509173a7d432bfdf83291
parent775d3a0a705b435a453f2a82ed940f5e650136ad
Reconcile with jb-mr1-release - do not merge

Change-Id: I8313a3f0bfe67f7d4c044d95edd9dcdc5672a37a