OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a79ed9 a58966d)
am a58966d2: (-s ours) am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into...
authorJohn Reck <jreck@google.com>
Thu, 27 Aug 2015 08:47:55 +0000 (08:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 08:47:55 +0000 (08:47 +0000)
* commit 'a58966d2dadc8e4be52aaf00d8478f83a61423e7':


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