OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1e0f9b 6231c94)
am 6231c948: am dc3561df: am 01de2432: am 24d8fa73: Merge "frameworks/base: move...
authorDianne Hackborn <hackbod@android.com>
Fri, 14 Feb 2014 02:03:48 +0000 (02:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 02:03:48 +0000 (02:03 +0000)
* commit '6231c948b0dc8dc97a5054f26c398a9a2884921f':
  frameworks/base: move idmap from frameworks/native


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