| commit | 2d66b91a06be80585effdfa8cd973706fc69b689 | [log] [tgz] |
|---|---|---|
| author | destradaa <destradaa@google.com> | Mon Sep 22 17:55:08 2014 -0700 |
| committer | destradaa <destradaa@google.com> | Mon Sep 22 17:55:08 2014 -0700 |
| tree | e8ace83678f7bfc30df45d47fd15bdad9fcd0ad6 | |
| parent | 3c4fc8711e22c5d79fd5e1dbc628a7a6b8fdb1a1 [diff] | |
| parent | 8ceb72230d9ff8e0ee096da1e2633f94685030a8 [diff] |
resolved conflicts for merge of 8ceb7223 to lmp-dev-plus-aosp Change-Id: I8f6a920550c3a108a8713525ecddf2ed1698773c