summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-01-30 16:26:18 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-30 16:26:18 -0800
commite97cc7d0b266ac0cbb1be7cf41ff8bb61067025e (patch)
tree4555994fbcf7b80f5ce9c76922f467aec65df71c
parent1314bdb2b22ae3613c3e08ae278dbc70f90b965c (diff)
parent8a2f3ecc030512b6813ee2bb8c56b77280cad7c5 (diff)
downloadframeworks_base-e97cc7d0b266ac0cbb1be7cf41ff8bb61067025e.zip
frameworks_base-e97cc7d0b266ac0cbb1be7cf41ff8bb61067025e.tar.gz
frameworks_base-e97cc7d0b266ac0cbb1be7cf41ff8bb61067025e.tar.bz2
am 8a2f3ecc: am 25503f1c: Merge from gingerbread
* commit '8a2f3ecc030512b6813ee2bb8c56b77280cad7c5':
0 files changed, 0 insertions, 0 deletions