OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:49:39 +0000 (15:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:49:39 +0000 (15:49 -0800)
commit0e2c2f3971eb4b246a5c1b198370e003668f53ee
tree1e3cbf41ef8ef551d73c5f303739a126301c6f9f
parent7ff7821a601a39fffb318e29873957b4a3703c46
parent0cd1fe7304946ae30d7bc081c64e17ae2d2c0ae6
Reconcile with ics-mr0-release

Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51