OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Mar 2013 16:32:48 +0000 (09:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Mar 2013 16:32:48 +0000 (09:32 -0700)
commit12445840fb80175bc0fa8016f7345b0f9cfc4ffe
treeb50fff4e48d16bc488ef5aaa7d2ef6d45501593f
parent5b286fc1841df2a788af9dcd7fa4dd05455da6df
parent0a48f2fc46a94f802a42f239ee295e39a0e8b26d
Reconcile with jb-mr2-release - do not merge

Change-Id: Id9603d15a01a36a07a95a23336e62a6b2c58bc16