| commit | a786b7a70e9e0c3f4ed3e02616ca661e78de403a | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Jul 14 13:26:19 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Mon Jul 14 13:26:19 2014 -0700 |
| tree | 7369d1deb42107decc58c177821939f24a884268 | |
| parent | 1c3171ea1601a59808ea0ab7e6f034baa5c49747 [diff] | |
| parent | 715b192a2727be41f0333a27ee23ca9c7b332d7e [diff] |
resolved conflicts for merge of 715b192a to lmp-dev-plus-aosp Change-Id: I81450ebb086579be0e38d6f8f00b1338675b7220