| commit | faa54a83d2d488a932115e7370c622cbdff31150 | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Sun Nov 02 20:03:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 20:03:58 2014 +0000 |
| tree | b4a1f258699b5e36403b8593f0aa87191c839a56 | |
| parent | 59edc74a04b28ea268b0f4e858d86eff9dd0c5b2 [diff] | |
| parent | 90c6294fcf74b3b3a6209fd1d08ce54c1e8c651f [diff] |
am 90c6294f: am 7d118538: resolved conflicts for merge of 94fc01dc to lmp-sprout-dev * commit '90c6294fcf74b3b3a6209fd1d08ce54c1e8c651f':