| commit | 56ef86df84ba7d8b26b663f49ae40f8c86b4b95b | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Jul 30 09:53:12 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Wed Aug 06 17:47:40 2014 -0700 |
| tree | 18c9342bc883f0446970c590e0d5b56cbfcca292 | |
| parent | c6b76767193322b086caad0d3968552e0229b28f [diff] |
resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp (cherry picked from commit 4a5a11e416425689d9f37a1963ae852051b451d2) Change-Id: Ic5c2297d50f2e59ca5b1eb0c3b81328d23a48253