OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 May 2013 14:31:31 +0000 (07:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 May 2013 14:31:31 +0000 (07:31 -0700)
commit268f5ccf7b8adf80f18ef8a9dac46a0813cec19f
tree9233061d186a6d92e9fb42f63fdffd98c68bc219
parent1cd68527a6c4cc92608dfe8a8c6ba51e5e2c4fc2
parentfb5cee14445622010af46da1fe9a013fe3868d48
Reconcile with jb-mr2-release - do not merge

Change-Id: Ia17841b4d49f0fe09e1034ff0b28efe55947f03a