OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Mar 2013 16:32:16 +0000 (09:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Mar 2013 16:32:16 +0000 (09:32 -0700)
commit6b094a67a25e6ebe53abb1748df05729244c125e
tree5196f2ad329463ec8007c461d2d5e668bad52536
parent12bfdf2024180c3cd361b9d76ed7874864b6d2d1
parente9abca1d257f83ac026ac13142acf0c73c778db2
Reconcile with jb-mr2-release - do not merge

Change-Id: I63d012a7e3ff3411b6fa088f7daddffeda11fd79