OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 01:57:10 +0000 (18:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 01:57:10 +0000 (18:57 -0700)
commit7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f
tree7bb495dc62af083f08d981a721fbeb3436aa596c
parent62224a32f00c344c8ba6edab2107c833700e26a8
parenta20b197260f33dc32f61b245934753c252c8b2f5
Reconcile with jb-mr0-release - do not merge

Change-Id: I3ec7be5d1d08566f120f18b68d2f691f92f006c8