OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f5d82b 5ee9fa5)
am caed0312: am acbd8d4a: Merge "TIF: fix tvInputType attribute to match with TvInput...
authorWonsik Kim <wonsik@google.com>
Mon, 21 Jul 2014 13:04:59 +0000 (13:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jul 2014 13:04:59 +0000 (13:04 +0000)
* commit 'caed03128dec1dd521a9ca1ed19ff60f89d8d868':
  TIF: fix tvInputType attribute to match with TvInputInfo


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help