| commit | e3a07da04db34befb689ee78a37d91703597679d | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Sun Nov 03 16:58:19 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 03 16:58:19 2013 -0800 |
| tree | 78a17dd945ae0892f2dc5d3741aa76d651821712 | |
| parent | 5e90c1485a5efe55502884a9f63994914ac19fac [diff] | |
| parent | 9dabc24f4117c6e57888b1202845fed8e03c8edb [diff] |
am 9dabc24f: am 4abacac3: Merge "Fix prototype of poll" * commit '9dabc24f4117c6e57888b1202845fed8e03c8edb': Fix prototype of poll