summaryrefslogtreecommitdiffstats
path: root/NOTICE
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2010-04-15 17:55:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-04-15 17:55:18 -0700
commit318249e46783c69d495c3a023b0de97757687050 (patch)
tree0417f183d8512fff6ae1d140e9ba15f180b19b6e /NOTICE
parent43725d4d4465e914a8c5209f254e780acc7fabd4 (diff)
parent5169fc57e38cda45d6fda4b47b727167dd937cc8 (diff)
downloadframeworks_base-318249e46783c69d495c3a023b0de97757687050.zip
frameworks_base-318249e46783c69d495c3a023b0de97757687050.tar.gz
frameworks_base-318249e46783c69d495c3a023b0de97757687050.tar.bz2
Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken
Diffstat (limited to 'NOTICE')
0 files changed, 0 insertions, 0 deletions