OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 May 2013 16:01:56 +0000 (09:01 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 May 2013 16:01:56 +0000 (09:01 -0700)
commit7b2f0b93fc5f6299511125e509560ac49f90e79a
tree3407ed0cc52989e74764ff463a13fb03c90fb72a
parent7ddebfad20c3ad136f42f80a2dc44c92b9b4b71a
parent531d9d38584e67b1efe110e2e53b60c662d41c27
Reconcile with jb-mr2-release - do not merge

Change-Id: I51461342bc651cb4e82db8a6a117d00a1017f4d9