OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5714170 557ee34)
am 557ee34d: (-s ours) am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge...
authorLeon Scroggins III <scroggo@google.com>
Wed, 27 May 2015 20:20:38 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 May 2015 20:20:38 +0000 (20:20 +0000)
* commit '557ee34d97c435e19034235aff258aea093efc3f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE


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