OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7e2d8b 7a4f82c)
am 7a4f82ce: (-s ours) am f4329d92: am 97e854bc: am ffe36bfb: (-s ours) am 1b4eed56...
authorLeon Scroggins III <scroggo@google.com>
Wed, 27 May 2015 21:41:37 +0000 (21:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 May 2015 21:41:37 +0000 (21:41 +0000)
* commit '7a4f82ce4b9e75810edf5435e0bba4b1ed682277':
  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