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:19:27 +0000 (12:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:19:27 +0000 (12:19 -0800)
commitb7afc4e15b29d933477328d1944c3201337808c6
treebd4aeef2de1cc07917abf9bf0a9d03dc08f3282d
parent92736efab068bdbfeb1177544907b84511fb04e0
parentf1a6123f9a05bdfe48129a9ed09ea6fcfe70e1f1
parent1cbe0ce40c523de48911fec2a94aec34e8ab14a3
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I8de173f6b24b2f82b20e568e577878d8539e5148