OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:25:50 +0000 (13:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:25:50 +0000 (13:25 -0700)
commit20d8abc638df1dba3c9dc95601aabed200a5abd1
tree727c3409a8497c0db2bc9e5a04399edccbfe0485
parent010a775e5120a86d8495806ccde3db11948831ee
parent930aca64f44bd5a302f6222877ee35a1996b4858
Reconcile with jb-mr1-release - do not merge

Change-Id: I577fb5bc77b6df44adec589f76d0c2aecdd8eba0