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:34:22 +0000 (08:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:34:23 +0000 (08:34 -0700)
commit3401c2e9e1343c964eb9495cbf8568172c14ac82
tree161906dde0f5435962cf384b8e57b12c1d3d9512
parent922e038b087076260ae7e29facc8121d46e8ba3c
parent7534553d4ca09fb8761a16317361529cc304612c
Reconcile with jb-mr0-release - do not merge

Change-Id: I29880eeaee48f2f841d9bfbf21c310e495f26ddc