commit | ee5618be0076ac359ab59af1c2ba945d85b2986e | [log] [tgz] |
---|---|---|
author | Jeff Hao <jeffhao@google.com> | Fri Aug 15 13:54:24 2014 -0700 |
committer | Jeff Hao <jeffhao@google.com> | Fri Aug 15 13:54:24 2014 -0700 |
tree | 241298bda1fd5ec8dafad63aa5f6037912b65a4a | |
parent | d538df6d1a40aec76d869a05f4372ad1dc3a6bfa [diff] |
resolved conflicts for merge of 549c9b17 to lmp-dev-plus-aosp Change-Id: Icea7763c830aeefa02d6a86c960c4b41148d397b