summaryrefslogtreecommitdiffstats
path: root/obex/NOTICE
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2015-02-17 23:30:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-17 23:30:34 +0000
commita94e42970d4e664e193cde0cf2700cb7e15961c9 (patch)
treeb813b9e2e3bb2c429de05c5ac12822af9972c771 /obex/NOTICE
parentd5471a0b2bf938cf83f4abac66a18664d8ca5277 (diff)
parentca0653a424f9d0f64ad15236c882af2b8ed2fe00 (diff)
downloadframeworks_base-a94e42970d4e664e193cde0cf2700cb7e15961c9.zip
frameworks_base-a94e42970d4e664e193cde0cf2700cb7e15961c9.tar.gz
frameworks_base-a94e42970d4e664e193cde0cf2700cb7e15961c9.tar.bz2
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
Diffstat (limited to 'obex/NOTICE')
0 files changed, 0 insertions, 0 deletions