| commit | 60803943f8276a311b7f985613b285a60b042886 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Sep 08 22:07:32 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Mon Sep 08 22:07:32 2014 -0700 |
| tree | 6563f51f1d37d4a7ffec7075fa5e5bd57357ff26 | |
| parent | 8bdebdd09271356e45395545e9d84567863bb248 [diff] | |
| parent | 00fe3544f60ccb6f8da01824a684ebd83d68c25c [diff] |
resolved conflicts for merge of 00fe3544 to lmp-dev-plus-aosp Change-Id: I2066866af1a59c85d90b15ae7fdf5b709dbf9cbe