OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:48:05 +0000 (07:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Oct 2012 14:48:06 +0000 (07:48 -0700)
commit377d8303be83b2d9977182babc38b7939ecb7e29
tree65e78f59f21bf8c7e935624237bdc8199474ddea
parent4df3123b6b3ef93ddb67ff0dbc8d94f5a4cebfe3
parentdee2bcd787fb79091967e7894437f6a412c95023
Reconcile with jb-mr1-release - do not merge

Change-Id: If88cdd28e163c84b5d6e64eb82b1c322d665a382