OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:17 +0000 (09:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:17 +0000 (09:49 -0700)
commit370c5e441d8c5902fbaa1e5c388409c7f3186771
treea31e46c5187efd56da7bb841dacc93b34a892c75
parent6283715f1349a2148196e772742676d9c8d9a844
parentbca9db3d65e4171a2f901f0d10a29bbcf6a3af88
Reconcile with jb-mr2-release - do not merge

Change-Id: I824c53b5cb75e9076acb41d0e5385499a25f3141