| commit | 5ebf501b41bb2392fa7881f882fab0fe1a0cf796 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 03 14:02:53 2015 -0700 |
| committer | Daniel Xie <dxie@google.com> | Wed Jun 03 21:21:34 2015 +0000 |
| tree | b55901001cda5ebb0b884693cb2441f2ea4a50b0 | |
| parent | 762d111509a0daba5f19cf1af8411a38684507e1 [diff] | |
| parent | e81d049a94f694adaab63fb5eedd4dc553508ee0 [diff] |
resolved conflicts for merge of 42b3de74 to lmp-mr1-app-dev Change-Id: I9c21d9f5dbc269bb0066d184895c9dca691a1f98