| commit | 5648b12da1357345b06ff86d41ff70a92d803093 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 19 15:50:13 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Fri Sep 19 15:50:13 2014 -0700 |
| tree | 0feac9fbd911da45b6484100e9a860aa9cfa6f14 | |
| parent | e9b6cb80580eb0ec2eeb8b15a2d298723882ec8f [diff] | |
| parent | 8791ebf0cd6475770be25459df669fe5da99ebe1 [diff] |
resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp Change-Id: Ifedb15de5a4db6cb0238fec93aaa2d95f1844694