| commit | 3656cc20c8a569964d0450ce3207b651c007c35c | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Thu Aug 21 17:30:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 17:30:39 2014 +0000 |
| tree | 6931963b83b155148dd0bacd7d806665a62b36d8 | |
| parent | f613f9e7af780863acc441bd70b10e19bb61cc6e [diff] | |
| parent | cd8a72c726b398e3bea5dfcc07c1c9c40386511d [diff] |
am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master * commit 'cd8a72c726b398e3bea5dfcc07c1c9c40386511d':