| commit | 72c70d14d41ca50e810af34c1977fa30f2d41567 | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Thu Jul 24 14:27:05 2014 -0700 |
| committer | Tim Murray <timmurray@google.com> | Thu Jul 24 14:27:05 2014 -0700 |
| tree | 19dcf021908c6356fdff992e7a57eaf557bd9458 | |
| parent | e7b374485f222ae4b6110091ebba66ec33c857b5 [diff] | |
| parent | 2812b27c5f0926a01373347fd9947f4d1667d3ff [diff] |
resolved conflicts for merge of 2812b27c to lmp-dev-plus-aosp Change-Id: I770fbf16affbd43b0750b50426298038e4b573b7