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