OSDN Git Service

Merge branch 'ics-aah-exp' of ssh://android-git:29418/platform/frameworks/base into...
authorEric Fischer <enf@google.com>
Tue, 6 Mar 2012 21:45:09 +0000 (13:45 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Mar 2012 21:45:09 +0000 (13:45 -0800)
commit16fdabbc77f73c0cbbb26f14640ebc05febeca64
tree75148725bc4c5497ad1fd10357fa7c79beeb3333
parent8806d5c99a22a4f5ab46c736530ad99ee8d0a0aa
parent69cd3c39aa17de75b3d0aee62e5048d45d30811c
Merge branch 'ics-aah-exp' of ssh://android-git:29418/platform/frameworks/base into ics-aah-exp