OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcce46d 9c5c01e)
Merge "Log the error when uncrypt timeouts" into nyc-mr1-dev am: e422b0b29f am: 170e5...
authorTianjie Xu <xunchang@google.com>
Thu, 29 Sep 2016 18:43:52 +0000 (18:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 18:43:52 +0000 (18:43 +0000)
am: 9c5c01e261

Change-Id: I0c8a2bb38171b0c717563a20bf9f480c4945d8f6


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