OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:05:59 +0000 (16:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:05:59 +0000 (16:05 -0700)
commitee8445a4de6a3a1d8eb3e4e9b0aadc582e121a9a
treecfd60623d0a9d77328ddb2b5207062452936f103
parent30b84c7d035c51a02238fd6163679876552863e6
parentbd589e324898ed77dff9cd3516d88ce4aca68352
Reconcile with jb-mr1-release - do not merge

Change-Id: Idb96902f4272f83b3ebc1081ace5d2511d4281b7