| commit | 080842d7fe65598854bfce9098e962e26dda07c7 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Sep 15 21:49:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 21:49:14 2015 +0000 |
| tree | 670502c95ec27994624f6f3ffeaec42a6993e195 | |
| parent | 27ee31b19da62e31237589e2d9ea296fe8653a52 [diff] | |
| parent | 8388f73dff655db833ee3e12f09db75b73527229 [diff] |
am 8388f73d: am f9777e93: resolved conflicts for d8f34e98 to lmp-mr1-dev * commit '8388f73dff655db833ee3e12f09db75b73527229':