diff options
author | Justin Ho <justinho@google.com> | 2011-03-14 18:31:06 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 18:31:06 -0700 |
commit | c460a3f61b5d81914e580c421999e3153093da0e (patch) | |
tree | 67f9dfa531f6d29d0d5bf8dbc3dee82c100c1127 /GenerationCache.h | |
parent | 86269a1e7e835152b1d1ee9057e117579bcc9711 (diff) | |
parent | 1586c133a3305045af277b69fec6f0f14bb234df (diff) | |
download | frameworks_base-c460a3f61b5d81914e580c421999e3153093da0e.zip frameworks_base-c460a3f61b5d81914e580c421999e3153093da0e.tar.gz frameworks_base-c460a3f61b5d81914e580c421999e3153093da0e.tar.bz2 |
am 1586c133: am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
* commit '1586c133a3305045af277b69fec6f0f14bb234df':
Fixing naming for disabled paste assets Updated paste assets
Diffstat (limited to 'GenerationCache.h')
0 files changed, 0 insertions, 0 deletions