| commit | f360467d7a3e94ea8f953d274808052c1ef8f600 | [log] [tgz] |
|---|---|---|
| author | Hiroshi Yamauchi <yamauchi@google.com> | Mon Oct 06 22:42:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 22:42:04 2014 +0000 |
| tree | ff708c0593eab1c1b89b204078633005f73f9b1b | |
| parent | 233806ee44f43fd1e296372458c3009ac061c76a [diff] | |
| parent | 92e7b912929528f23abef6b33d9fa6e6bf327ccc [diff] |
am 92e7b912: Merge "Fix a merge error in cl 108991." * commit '92e7b912929528f23abef6b33d9fa6e6bf327ccc': Fix a merge error in cl 108991.