am 2bcb25c1: (-s ours) am 0660be89: am a6a12a78: am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev

Browse Source

* commit '2bcb25c1c3153a28229bffcdd4d289ac72b987cc':

...

This commit is contained in:

Yabin Cui 2015-08-27 05:05:46 +00:00 committed by Android Git Automerger

parent 3ce99a04a9 2bcb25c1c3

commit 0bbda9838b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available