OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:16:33 +0000 (09:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:16:33 +0000 (09:16 -0700)
commitf0e55de3b1b099c413d430d8f9d46361454c85d2
tree5cf5e8c05bd861751d3e6cf5a0c1f819bf6868e8
parentdd4e72b44ddb7a1591bd2f81c46d20bb0939e9eb
parent090e1b311aabe287eae5bc4f7816d0384f284713
Reconcile with jb-mr1-release - do not merge

Change-Id: I7cd153e8ccfb7d572a5796ca353ec9777de789d6