OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:37 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:37 +0000 (16:43 -0700)
commit1a37c1b012e4c38cafa1c4e945cd8cd690e7e105
tree45e3158206a805f87e4c481cbad83134a9a53f45
parent2046249565caca3df9806e5ebdddafb328535608
parent4b3d471e309983e3a4c6b1f092e2b0d0f1e10ff3
Reconcile with jb-mr2-release - do not merge

Change-Id: I666a136b9a745370acd7ed37cb78c19939d6ac00