OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 7 Jan 2012 02:15:13 +0000 (18:15 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 7 Jan 2012 02:15:14 +0000 (18:15 -0800)
commitb470ec5eb16e08f6d0d24bf79aa76c05fe5543a1
treeec9e13131339633dcd8a9785bdf0db7588020d95
parentafb3f7fd1a093c333a90cadfe484fe2643e57031
parentd9a4d0bdc90c2ad37b0e9a818d8fd5cbbe624c7c
Reconcile with ics-mr1-release

Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c