OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdc8188 7f9a9bc)
am 7f9a9bc7: resolved conflicts for merge of e9febcc0 to master
authorNarayan Kamath <narayan@google.com>
Tue, 28 Jan 2014 20:21:52 +0000 (12:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jan 2014 20:21:52 +0000 (12:21 -0800)
* commit '7f9a9bc7bfc3bf1ac7de4f20431017d37a28a315':
  Track 64bit changes to android/graphics.


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