OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Dec 2011 15:19:13 +0000 (07:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Dec 2011 15:19:13 +0000 (07:19 -0800)
commita4b72c9fe4ea6e984440d67538eee26fdb140d8d
tree748fef08cf3896188b6e5f6a7d43fce92cb048e5
parentb08c5647a42d07d905823ccf2a88a3a8051af006
parent457b7f38a584f157ebeea4414c05f3e546838f94
Reconcile with ics-mr1-release

Change-Id: Idb5f4da7a973995eafb7233d864c0cf379e35db7