OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Nov 2012 15:19:14 +0000 (07:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Nov 2012 15:19:14 +0000 (07:19 -0800)
commit79ab2553a77c0f111e990e3aec342ce0cde87fc9
tree4ffa3d9c5bb05c59aa2324de213b7cc75600dbda
parent17e06817a22f2a13baddec627dbf385d8799a604
parent46527fef4dc8186c7b64ef963e1e2d1295cf7e08
Reconcile with jb-mr1-release - do not merge

Change-Id: I5d3a0c41a1626bdf59f75cd8d989d0d725fc4680