OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b36ace7 425d7c8)
am 425d7c87: (-s ours) am 11297581: am 18d79267: Check that the parcel contained...
authorLeon Scroggins III <scroggo@google.com>
Wed, 27 May 2015 15:10:30 +0000 (15:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 May 2015 15:10:30 +0000 (15:10 +0000)
* commit '425d7c8713679ce9799139f7f91c6a45caa3b486':
  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