OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Dec 2012 19:34:37 +0000 (11:34 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Dec 2012 19:34:37 +0000 (11:34 -0800)
commitbc9e8c4a63e91305fe182de414cca8220e0023c4
tree1ed052f9869228f733448d4eafd2db5bfc13ea6f
parent783d0e7d9d2dcc05a45b2c5ec7117f61f460642d
parent7c980ad8ed99c4c0c1c08687fe40a5602a91c202
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I889bdeceda8d6b158a8b70596450156f5a68910f