| commit | 14db2c5a08c3f2d5214b93528afb911a06ec4124 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Tue May 13 15:16:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:16:25 2014 +0000 |
| tree | 159b54467091f0dcf043991bec8ba0cec5e05255 | |
| parent | 1dce01c7aceec3f4f744095467834f14b990f49c [diff] | |
| parent | 8e23fbbdab8cfea15a4acd8cbf7fa43a558cf48a [diff] |
am 8e23fbbd: am 23b163fd: am e3a07da0: am 9dabc24f: am 4abacac3: Merge "Fix prototype of poll" * commit '8e23fbbdab8cfea15a4acd8cbf7fa43a558cf48a':