| commit | 9d7239a67aed1f910cefec79d1109123de106520 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Wed Sep 16 21:58:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 21:58:56 2015 +0000 |
| tree | cc9e28f84b7b3f4b627d5da76a5356650ec936ca | |
| parent | 2ff6f9247b9b4c9c7ff5953091cf322a29d266f4 [diff] | |
| parent | f322a2613852535e21283dcfa178dce05eea6176 [diff] |
am f322a261: resolved conflicts for fa586518 to lmp-mr1-dev * commit 'f322a2613852535e21283dcfa178dce05eea6176':