OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2402aa 7df8972)
am 7df89722: am a58966d2: (-s ours) am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COU...
authorJohn Reck <jreck@google.com>
Thu, 27 Aug 2015 18:13:31 +0000 (18:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:13:31 +0000 (18:13 +0000)
* commit '7df89722421cf5a954065e9aee7fb3c1ab03c1ee':


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