summaryrefslogtreecommitdiffstats
path: root/libc/kernel/uapi/linux
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2015-08-11 18:56:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-11 18:56:43 +0000
commita6a12a7804402273e193074a58162cc0b3890812 (patch)
tree0c9203a5a50a8ffcde795c98cf00a8fc2fbfceb1 /libc/kernel/uapi/linux
parent8beb0c34da46a5146a2de8256db8bb42febb283c (diff)
parent0fdcdd0067af88e7deef73070d0861ceb9f53c37 (diff)
downloadbionic-a6a12a7804402273e193074a58162cc0b3890812.zip
bionic-a6a12a7804402273e193074a58162cc0b3890812.tar.gz
bionic-a6a12a7804402273e193074a58162cc0b3890812.tar.bz2
am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev
* commit '0fdcdd0067af88e7deef73070d0861ceb9f53c37': Fix flaky test time.timer_settime_0.
Diffstat (limited to 'libc/kernel/uapi/linux')
0 files changed, 0 insertions, 0 deletions