OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 16:54:32 +0000 (08:54 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 16:54:32 +0000 (08:54 -0800)
commitd7545049bfe7142389eae84394d6b76ed9b68fb2
treeea253f59b19dd06fa647d16907d888a1fb0442e9
parent3375b2274ce109fbe8f8d1804655a9eadaa067a0
parent7cf5542b9dcbc72fe4a235a129908bc6ea87b698
Reconcile with jb-mr1-release - do not merge

Change-Id: I8db9fb7159802c84866bdc4edd136c9a75880397