OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 17 Nov 2011 23:36:45 +0000 (15:36 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 17 Nov 2011 23:36:45 +0000 (15:36 -0800)
commit77b2771bd2bc26aefdf9ff3a3d96b54799185917
tree8f85f31e4686487df38ddc3548ed85db575e0b3c
parent44d7d24f97f7de13a490ec3279f07e7af7bb98a5
parent4d6822265899f39899426dcfbb0488d03b0035bf
Reconcile with ics-mr0-release

Change-Id: I42fcd347d98058118f225dedd011cb2fac76bbb6