OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9bb081 29e4cf0)
am 29e4cf0a: am 2ac81ee6: (-s ours) am c4e6233b: am b68d38e8: DO NOT MERGE change...
authorChong Zhang <chz@google.com>
Tue, 25 Mar 2014 00:38:14 +0000 (17:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 00:38:14 +0000 (17:38 -0700)
* commit '29e4cf0a1a0ece43d524b4dfa340ab98da6e19f5':
  DO NOT MERGE change Surface constructor arg to 64bit


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