OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Nov 2012 18:19:36 +0000 (10:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Nov 2012 18:19:37 +0000 (10:19 -0800)
commitb791a5fb7930e8ad8108e59fb87b6183e516a382
tree1325f623d904d5f170f8b175c2dca25a2e3917ae
parent83c3110c401fc21f6b4a47db7e9732a7b0d00e9b
parentc3102ba02e33762e7e2598c38b8d56875d9310b3
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie6ab54e92b8261bc8b2fb8819e73631237a04e84