| commit | f89fe0c314bd831da6eb08f196a052858e2a37c4 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Fri Sep 11 06:18:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 06:18:35 2015 +0000 |
| tree | a38ea34f568c07797522b24299c5382594141617 | |
| parent | dee022694696c4a74669c872610729ff39814f21 [diff] | |
| parent | 323ba84ea739e392f89181e5465fea3f29378032 [diff] |
am 323ba84e: resolved conflicts for d84bdafb to lmp-sprout-dev * commit '323ba84ea739e392f89181e5465fea3f29378032':