OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:15:30 +0000 (07:15 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:15:30 +0000 (07:15 -0700)
commitff1da09d3b83e9e821bc51442905771a136dbca1
tree0d45ef9558635befd44e748f0a0671d9aff2e233
parent5cbda9a80c23125ac1fa7d722d948fd59a79f793
parent66679a1c2fb908bc62cfe495da4deda7eb53dc35
Reconcile with jb-mr1-release - do not merge

Change-Id: I65271947f0e7aef323f59617db1bb1a6744bf31e