| commit | 8dcf593f90792272bd21e498da1aeb60fced1989 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Sep 30 16:41:19 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue Sep 30 16:41:59 2014 -0700 |
| tree | 0604011e1998db570eee150a12df059d40ace93c | |
| parent | 749ee396ccc0a767fce28afe5a3112de38491ece [diff] | |
| parent | 6290c048e1679ae6c814a5e1b2efa4456f9bfb97 [diff] |
resolved conflicts for merge of 6290c048 to lmp-dev-plus-aosp Change-Id: I9fd4b4402f301c3521f57b207793ab4dfdd67a12