| commit | 15c3381803eff58d75f4fae5c0e528bfea466473 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Sun Oct 26 22:47:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 26 22:47:46 2014 +0000 |
| tree | 85ee24cff1a17cebae35acbac8c9c9420524a608 | |
| parent | baaa4a781ca0a258bf8e82073c80010bfa6c8b34 [diff] | |
| parent | c2e8691cc3f7f04fe2258b83c91b25f5ba1208d6 [diff] |
am c2e8691c: resolved conflicts for merge of efd44c45 to lmp-dev-plus-aosp * commit 'c2e8691cc3f7f04fe2258b83c91b25f5ba1208d6':