summaryrefslogtreecommitdiffstats
path: root/NOTICE
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-02-17 22:51:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-17 22:51:48 +0000
commit65d12bf7f14ff7568cc3011793e219391f9c3d29 (patch)
tree3df8a2ed5fab85751b5e0eaab375c2b5f7a016f5 /NOTICE
parentea970051283dc11da11897771608f306b9fdfbbb (diff)
parentc7067053252413f78edbd6f21618a65a72235542 (diff)
downloadframeworks_base-65d12bf7f14ff7568cc3011793e219391f9c3d29.zip
frameworks_base-65d12bf7f14ff7568cc3011793e219391f9c3d29.tar.gz
frameworks_base-65d12bf7f14ff7568cc3011793e219391f9c3d29.tar.bz2
am c7067053: am 2b29d96f: am 82510fa5: am 9c9a3afb: am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge: fa40f00
* commit 'c7067053252413f78edbd6f21618a65a72235542': docs: studio proxy setting setup docs: studio proxy setup
Diffstat (limited to 'NOTICE')
0 files changed, 0 insertions, 0 deletions