| commit | abbb721864ee336bc13ea14aaf2de76776dd9680 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Thu Sep 10 19:58:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 10 19:58:13 2015 +0000 |
| tree | 2a7a649a16f48ac94224a747ec8221d43f7ea36d | |
| parent | c34cb56e5d18dcdfcddc0df6caef21e3b4a1c117 [diff] | |
| parent | 581367e038189f853c583a5e084c0d0e2fbd11e4 [diff] |
am 581367e0: am 2ebb3bbe: am 3dc22522: am 163002e6: resolved conflicts for 7db619d7 to lmp-sprout-dev * commit '581367e038189f853c583a5e084c0d0e2fbd11e4':