OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Apr 2013 20:35:34 +0000 (13:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Apr 2013 20:35:34 +0000 (13:35 -0700)
commitbdd47e503cf336cce34ac941c07726377396826d
tree084b01d3c8f9453142ed06c3d81f0ed84c924793
parent8537b6145ad275d6fb40e5be4286ff43eaace868
parent8db145f199a827df455bad7acfa380b0da8abb04
Reconcile with jb-mr2-release - do not merge

Change-Id: Ic29dadd7db4775b7812868535dd2c510a64f0591