| commit | a19dcc1eb21af0c03b0c73a0eef5f6d80dd24b65 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Sep 12 15:50:37 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Fri Sep 12 16:14:42 2014 -0700 |
| tree | a865b19a7af16a6b08aacfc157e8af6226d06448 | |
| parent | 5a203cfb6eacbd1906209596ca0895dce41894f3 [diff] | |
| parent | e9bc73723b8a9456933b04104595fa1bd3a3456b [diff] |
resolved conflicts for merge of e9bc7372 to lmp-dev-plus-aosp Change-Id: I952793dc6c7d17b31a011b4525e76c7b64299491