OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Oct 2012 14:31:00 +0000 (07:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Oct 2012 14:31:01 +0000 (07:31 -0700)
commitc5a70b1d2474f47929658b90f51390de700d64c0
tree94c810fb99bcb7cd06610ef36d4d4e3c88bf0166
parentf5b27f714063361d07a7ca6f107bba3e13b75d38
parent8b4053a1aa0de3266ab6e23022d14265b54d2afa
parenta58b6a4bcd0c2877694fc0800852ab58f2e78604
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I38012327dc2f36e7e2a6773a2e1dfc49be6475ad