| commit | ed61465e67d068150c18b043a4fd234646701e00 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Wed Sep 16 22:36:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 22:36:23 2015 +0000 |
| tree | cc9e28f84b7b3f4b627d5da76a5356650ec936ca | |
| parent | 9d7239a67aed1f910cefec79d1109123de106520 [diff] | |
| parent | a174bf325f2a7c445f8ea531040ce7f96873b765 [diff] |
am a174bf32: resolved conflicts for e78a371a to lmp-mr1-dev * commit 'a174bf325f2a7c445f8ea531040ce7f96873b765':