OSDN Git Service
(root)
/
android-x86
/
bionic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c534603
61b040a
)
am 61b040a5: resolved conflicts for merge of ea248d9c to lmp-mr1-ub-dev
author
Yabin Cui
<yabinc@google.com>
Fri, 5 Jun 2015 02:18:45 +0000
(
02:18
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 5 Jun 2015 02:18:45 +0000
(
02:18
+0000)
* commit '
61b040a57094093cfb090ebb1c321d4a69c20b64
':
Make sys_resource test more robust.
Trivial merge