| commit | 305e60ba0222a9e1edb43a3daba96f2555f83d85 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Fri Jul 25 11:44:37 2014 -0700 |
| committer | Stephen Hines <srhines@google.com> | Fri Jul 25 11:44:37 2014 -0700 |
| tree | 3fb92c60ac805ea2e216aa229548f46cc1518054 | |
| parent | b3c3f9384f3ba864baac1ea7d0f7ed6e9c125ff2 [diff] | |
| parent | 9ef2ec9b8a80899c65db212693b43aceb6c79196 [diff] |
resolved conflicts for merge of 9ef2ec9b to lmp-dev-plus-aosp Change-Id: I22a24179518bf5de94a22b21cb4c86fce3e012e6