OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 21:48:46 +0000 (14:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 21:48:46 +0000 (14:48 -0700)
commit4124016ae5c8174aa53433894b896604ffa52c67
tree30f8d67905ea54467b9b21d41abe1e3e3bc8e791
parent857b2ef099083cb2c35ed2b03030d0b8c6c80abf
parentfcc1116423cf4fe12faca9ac7fd2f0d2fe1d18ec
Reconcile with jb-mr0-release - do not merge

Change-Id: I96a076254209becd703d8a61d027bd41527f58fa