OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:05:52 +0000 (08:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:05:52 +0000 (08:05 -0700)
commitc476f09d4a8c37c16e352cbcf3745e1b33ede7fb
treea4806fca16d22780237a4c61b14638afdd508586
parentaf503b044475dc29ce58f715739158036807e94e
parentefd3b17e640f2a820c77a157c20e33c45b9b28fd
Reconcile with jb-mr1-release - do not merge

Change-Id: Ice7d89d927b01c03db60deaa0f00840df514ee96