OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7c7c34 28b0516)
am 28b05169: Merge "resolved conflicts for merge of 6db87978 to master"
authorRobert Ly <robertly@google.com>
Tue, 12 Feb 2013 19:05:32 +0000 (11:05 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Feb 2013 19:05:32 +0000 (11:05 -0800)
# Via Android Git Automerger (4) and others
* commit '28b05169c0a3ddbe2fb59001c25410dfe724ce55':
  Revert "makefile changes for s.a.c"


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