| commit | c785caa4b44a1a96e21904fac8cf857f2d9f5e96 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Jul 12 19:36:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 19:36:58 2014 +0000 |
| tree | 5466f7555bbd26f80c30cd2633ad6345caa4abb1 | |
| parent | 3aad879660686ec3d88994bd9f0716ac861f6e2f [diff] | |
| parent | 802943ab514de0814078b2e0a400d18632daa188 [diff] |
am 802943ab: am 8098114c: Merge "Sync with upstream grep." * commit '802943ab514de0814078b2e0a400d18632daa188': Sync with upstream grep.