OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:54 +0000 (10:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:54 +0000 (10:05 -0700)
commit711d2c797505288085016d0e4e6f3236e02f1263
tree6735b88ad487a353d77efaf43b647cb83123a439
parent53699202c00e7e6090d324b655c30ea2b8b58f74
parentf10bf1b75a145540ee6d47f82be942e09555f347
Reconcile with jb-mr2-release - do not merge

Change-Id: I1ffbbe79376c9e0f93dea90e11dfb86b07715328