| commit | 8bdebdd09271356e45395545e9d84567863bb248 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon Sep 08 22:00:39 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Mon Sep 08 22:00:39 2014 -0700 |
| tree | 6563f51f1d37d4a7ffec7075fa5e5bd57357ff26 | |
| parent | 968051af0976e82e6e2d5969ae0341147d5602b1 [diff] | |
| parent | 0ff86c774b6e1642f02414db24cfd5fb5c185a18 [diff] |
resolved conflicts for merge of d7f604af to lmp-dev-plus-aosp Change-Id: I70d2209f92f6098fe8335f7a1f47df6cd1d6d2aa