OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 Aug 2012 22:36:47 +0000 (15:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 Aug 2012 22:36:47 +0000 (15:36 -0700)
commitc7314cea25a040536048bf19515c8fa9e22fee95
treeb88c6115147083b544f1493f5ae04c7fbf314ab1
parent7c488c1b4e989f742f0525603c41bef9673aa239
parent522ccfee04cbd95f021acf674e4488428de925b4
Reconcile with jb-mr1-release - do not merge

Change-Id: I1bfc1867c44e5793876b1bd237b134cc8357e25a