OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:33:53 +0000 (08:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:33:53 +0000 (08:33 -0700)
commitd4c6a2edde97a7709086e9a3b7ecb028cecd9bfb
tree510c1fbe942afd03a799f06d385a8d8f48470a6b
parent35b24a8234baa93d23a9ea029b8e8e675b134f7d
parent951f93e91eb1d7f543c9d0e9d023325c0a318207
Reconcile with jb-mr0-release - do not merge

Change-Id: I21582e8cedf809f04f7d04d9af5a34c21ea77f41