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:53 +0000 (14:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 21:48:53 +0000 (14:48 -0700)
commitf6162c80cf048fe710f5cc0502fcfc052ff98385
treefd1dceecae7bb131189855b5782aad1f0273791b
parent9691c1e646b143690476724b1d7f8dc788cfe00f
parent2e1cf2aa706bdb4e9f4dfda2041b47a6cf962ebc
Reconcile with jb-mr0-release - do not merge

Change-Id: If5252c45f4163409ab8375e27cb13f3f06a237b6