OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:52:31 +0000 (07:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:52:31 +0000 (07:52 -0700)
commitc8a5ea665182c454d1e4889b8c2727750383e9d6
treeaa36775312ff911e727c72064b75ab6b0e2deb38
parent1cdda6a3753f5d776e026fdf421bab3289111cce
parent02312279c39aa9827ff41cf3ef96aa66185474ca
Reconcile with jb-mr1-release - do not merge

Change-Id: I65f1a13c4c6203332e2184e5625dde8cc4cbb8f6