OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:18:29 +0000 (10:18 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:18:29 +0000 (10:18 -0800)
commitc902470310404e42aeb93fca38694b374371e0de
tree3baad09149b3873134aae029ee2942b3092e2d57
parent529a793c69f7ab133a29da8e50e67e8e47f2175f
parenta7af7e050e41fc80d418b8b0cdeded5889daae2e
Reconcile with ics-mr1-release

Change-Id: Ib912870641c7efedd4c01066f0e86dd3f85aaa2d