OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:43:37 +0000 (07:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:43:37 +0000 (07:43 -0800)
commit346f5a481b945251245429be649c005a0d9103ad
tree8a4d3d40069a7162a8f8ba3b8a918d74baf08e91
parent60331810199d15048027140f4d70328625dea13c
parent2f9011a1b1b20a8bd4d2de4a66f39f2f07a540b5
Reconcile with jb-mr1.1-release - do not merge

Change-Id: If815fb1e8d064c7abb53ef05b81bb1495cfb7b2c