OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Apr 2013 15:39:24 +0000 (08:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Apr 2013 15:39:24 +0000 (08:39 -0700)
commitb9376fddcc5d727d7dd68cd3b84a0e8175170bc3
tree7328054d0c2069aa2ca3d57a97f2fcd5086cf733
parent567c7f880970a10020fd7a5df2695311e2ea8cf8
parent9cf0f4b8928b518dfb5f993395ccd4f8d8fa71ab
Reconcile with jb-mr2-release - do not merge

Change-Id: Id88870b54e658510c449c30901a9f511fca500b4