OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f51538f 0b18c14)
am 0b18c149: am 0f50cb31: Merge "Fix build."
authorElliott Hughes <enh@google.com>
Wed, 10 Jul 2013 00:53:32 +0000 (17:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Jul 2013 00:53:32 +0000 (17:53 -0700)
* commit '0b18c14931c4ca618c67b5ac5c8351246879e90a':
  Fix build.

1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help