| commit | 9b555157a8ff9c5e4fb47987b18a7fad5c50e3ff | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Sun Nov 02 19:29:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 19:29:50 2014 +0000 |
| tree | 365909a4593e6d068091f2e87c5232163450c88d | |
| parent | 2ff95f6fe6cbb99ae68142dc201e1f78f812418d [diff] | |
| parent | 1b19a301980ea368f0d5cb0507c925eca24abb98 [diff] |
am 1b19a301: resolved conflicts for merge of 41b2d050 to lmp-sprout-dev * commit '1b19a301980ea368f0d5cb0507c925eca24abb98':