| commit | 841c633fa13ba8d48563fbda247e75bab3bd6f49 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Jul 19 20:15:42 2014 -0700 |
| committer | Baligh Uddin <baligh@google.com> | Sun Jul 20 10:43:16 2014 -0700 |
| tree | 66fafe44674c88f00de2e9d6c78e5d6b6de36c4c | |
| parent | bdfb313cf1cefd4ffaa59c6aea20a49608a73a52 [diff] |
resolved conflicts for merge of b5bef263 to lmp-dev-plus-aosp . Change-Id: Ieef30b3a308ca3cad4a59f17566d4cede0ae2b16