| commit | 12c9391bc7db23cc00385ba797e02220555a1e89 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Sat Oct 25 19:53:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 25 19:53:46 2014 +0000 |
| tree | 631f292f06f13d22620bfd68f94ab1e55b717cf4 | |
| parent | 220869bbd6a3f9254dcda0b88ae85ed170158750 [diff] | |
| parent | 3beb9eae9a43c579a376b4256e07ff97852ed258 [diff] |
am 3beb9eae: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev * commit '3beb9eae9a43c579a376b4256e07ff97852ed258':