OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 21:48:19 +0000 (14:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 21:48:19 +0000 (14:48 -0700)
commitca4117ca387fbcd8a9e18070e0a73c2eae4baa22
tree82b1b601d482ae6f3459bfdd3f189bbdf208c890
parent194da0b8b368ac61b23870224bc0d449ad465bd4
parent4594d8baf85080e9a5b3ae25ad809d6d924e6e88
Reconcile with jb-mr0-release - do not merge

Change-Id: Ica8b95c440b5c3fe0a7d31e9633d4ac1b0e02c38