git.osdn.net Git - android-x86/frameworks-base.git/commitdiff

author	smain@google.com <smain@google.com>
	Tue, 9 Dec 2014 20:21:52 +0000 (20:21 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 9 Dec 2014 20:21:52 +0000 (20:21 +0000)

* commit '6310c32386b053fe25a8e2c11354de65681088b3':
add studio 1.0 files and reorder features list

		1	2
docs/html/sdk/index.jd	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

frameworks/base

About OSDN

Find Software

Develop Software

Help