OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:17:42 +0000 (12:17 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:17:42 +0000 (12:17 -0800)
commit62fcb21577ccdd68dddd6b6984ad0ce58ee0c228
tree6b73b50d39ea0317cf5b2866f7492a2290ada6e2
parent5a484b753cc72d6a50c1dd3bbf68b3403c741a3a
parent90dbdf26e6fa8093ff2a3803f84f0020ee81647b
parentebc42af458e519e930d0840e6775a31ee57a54be
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ia0e74b5de81f7a112a2e4d829111c6cc7d937617