| commit | a25dc2bbe70b7449dc57e9619778ba592c198003 | [log] [tgz] |
|---|---|---|
| author | Alex Light <allight@google.com> | Tue Aug 05 14:25:43 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Wed Aug 06 22:25:00 2014 -0700 |
| tree | f497fe5905be0a10103c77590068e888db0af688 | |
| parent | 7bbf9e720d12c06c46c468f18848b37d61bcaf28 [diff] |
resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp Change-Id: I1fe0e64d2069b7424014bd3ff0bf6f80b439220d (cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)