Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:43:44 +0000 (15:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:43:44 +0000 (15:43 -0800)
commitf1c794aae7980595f15efd8398ae3148e8ed154f
tree2867f007dd3de64d1bbff59987e88eadfb779256
parent08dffa7432868059425df0ce657febc9632c464f
parent3966932e171ead980cc0ade5cdec1361f1c830c9
Reconcile with ics-mr1-release

Change-Id: I5a17b2bdb6c727bb3bc6fcfcb378ef3557ad0883