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)
commitbbe63c7c84d92f7f59be207af2bfdb5662a6dc8f
treeb50fff4e48d16bc488ef5aaa7d2ef6d45501593f
parentd571b703f939e1663bf6c7ab12ffad0c025897df
parent4cc04a5c9d962b82d0ac87bf31fa2c37483a2ef4
Reconcile with jb-mr2-release - do not merge

Change-Id: Id9603d15a01a36a07a95a23336e62a6b2c58bc16