OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a268af 35a9e33)
am 35a9e339: am fc15f899: Fix build issues from bad merge
authorJason Sams <jsams@google.com>
Thu, 13 Mar 2014 10:53:01 +0000 (10:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 10:53:01 +0000 (10:53 +0000)
* commit '35a9e339687a0c5423c3433ff0c335ad9e1e0656':
  Fix build issues from bad merge


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