| commit | 2db8b4dca9cc6e7c3dbae787a3d1ab1782d91464 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Sep 03 15:27:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 15:27:57 2015 +0000 |
| tree | 7c4d6d93f572c80e974289771e1d16ed06ef46bf | |
| parent | 5b9ef496991e156a270ec22b5cedf12e0a8d4935 [diff] | |
| parent | bccc13cccc2b5a534b5b4cdf62c7be20edaef046 [diff] |
am bccc13cc: am debc2a5f: resolved conflicts for merge of 6c1149d7 to lmp-dev * commit 'bccc13cccc2b5a534b5b4cdf62c7be20edaef046':