OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:37:59 +0000 (12:37 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:37:59 +0000 (12:37 -0800)
commit51177f0c301344296162a8af7cca37990d239e53
tree9584bb37c42d47376181e7b51b4d9ce7ea46226b
parent2197081fa0bf8bd1282e17b933c30b84e9b65b18
parent1d0f1b685a8d4e1e17ecf0fd100a792356c09235
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I538dcad23578c67aac157ea9c60b5e27da195d69