OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:26:05 +0000 (07:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:26:05 +0000 (07:26 -0800)
commit2e939805afafebced02bc3ed027807291ddd5dc4
tree4ffa3d9c5bb05c59aa2324de213b7cc75600dbda
parent5194366bcdb91d5908c8db50f002a891fe8b8bde
parent3f0e0921daf2552d6977f87848a2ecdaad1d79df
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie852ca3761e50d4e84e554572faa3920e1880821