| commit | 2f8ffda4fa2a2c8002a7cc799ed23fa85cc706ee | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Tue Sep 30 14:26:27 2014 +0100 |
| committer | Vladimir Marko <vmarko@google.com> | Tue Sep 30 14:26:27 2014 +0100 |
| tree | 2719f459115567cb561aeb307285f1cc254ed385 | |
| parent | 2a7ea973f7110f2af97a57610737828397144683 [diff] | |
| parent | 79705f99ea6351c8625f47b8659ecd56a4120459 [diff] |
resolved conflicts for merge of 79705f99 to lmp-dev-plus-aosp Change-Id: I6a87d6f2364ba3ac86d13faaf161dcc65990e4bb