OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8af18df 8822d4b)
am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master"
authorJeff Brown <jeffbrown@google.com>
Fri, 2 May 2014 01:26:29 +0000 (01:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 May 2014 01:26:29 +0000 (01:26 +0000)
* commit '06dec5656d75345566fd31a2cfc6bd5c84bf41de':
  Clean up some terminology related to interactive state.


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