OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edf85a9 47dcb46)
am 47dcb469: Manual merge of e4ccb864 from frameworks/base/tools to frameworks/tools
authorAlan Viverette <alanv@google.com>
Mon, 27 Jan 2014 18:40:50 +0000 (10:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 18:40:50 +0000 (10:40 -0800)
* commit '47dcb469db6e81b733a3f2eaa6bc4396ebfb3fd0':
  Manual merge of e4ccb864 from frameworks/base/tools to frameworks/tools


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