OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfb7ff4 7faa9f7)
am 23818a23: am 94614a7e: Merge "Increase long timeout to 2 minutes" into lmp-dev
authorEric Rowe <erowe@google.com>
Mon, 15 Sep 2014 21:19:46 +0000 (21:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Sep 2014 21:19:46 +0000 (21:19 +0000)
* commit '23818a2329ae4d200d69250a1d4bfa9a9370a4d4':


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