OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:18:16 +0000 (07:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:18:16 +0000 (07:18 -0700)
commit96310898348b409cc15de49baba8b7a31b9a8683
treef91a2bebfd2b4cc6875cf7f932222833511a5df8
parent341dcc1e011cb51bb0f8bf702d1164b9b0f6db3b
parent91fb7aabc908a17000c1c0241c371c4099262861
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic5f4d5010eedb666a8881982067b136cdc220fa7