OSDN Git Service

Merge jb-mr1-dev into aosp/master - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 16:21:40 +0000 (08:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 16:21:40 +0000 (08:21 -0800)
commit19f09fb127cd193023fe518f4fe3ae890c1b52d4
tree41c9285106acbc595b8d5a583aa122fb0a116b6c
parent9cd44a18c7d208cac0dc3c213cf4d6567cc945e0
parent401299739295b2305707810bbae2e49eadac50ba
Merge jb-mr1-dev into aosp/master - do not merge

Change-Id: I07ffd44995f02108e9a981fd590e7e29ff813e7f