OSDN Git Service

Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:49:54 +0000 (13:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:49:54 +0000 (13:49 -0700)
commit1210541bfd9a3359cec9c00c42caaa74d2a65f5a
tree80db74d598cf9afe53b864409409ec57ebade51d
parentad808f5da422b13489edb04b38daf871e5f977a6
parentb9201d1c40074a2bcd5ed78a4fd426473caace78
Reconcile with jb-release - do not merge

Change-Id: Ie539da33a9901ca28759cf85c566bdf201191319