| commit | 378866f7e7f26eba1f9b877418ebded41e6d8d41 | [log] [tgz] |
|---|---|---|
| author | Fred Shih <ffred@google.com> | Thu Jul 17 13:35:11 2014 -0700 |
| committer | Fred Shih <ffred@google.com> | Thu Jul 17 13:35:11 2014 -0700 |
| tree | 5d48772e203ce4d06f6da77864dab7b3adc2e4cc | |
| parent | 7661e87586685dc6246e504da7a959c006020467 [diff] | |
| parent | d85614222fa062ec809af9d65f04ab6b7dc1c248 [diff] |
resolved conflicts for merge of d8561422 to lmp-dev-plus-aosp Change-Id: I5e379c083a08051909a8ddf5ff1c158ce9e7ee9a